fix formatting markdown README

Perl changes, add picons file to gitignore and update XMLTV to 0.5.69

.gitignore

@@ -41,3 +41,6 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+# Picons file
+picons.tar.bz2

Dockerfile

@@ -1,10 +1,14 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.5
 MAINTAINER saarg
 
 # package version
 ARG ARGTABLE_VER="2.13"
-ARG UNICODE_VER="2.09"
-ARG XMLTV_VER="0.5.68"
+ARG XMLTV_VER="0.5.69"
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Build-date:- ${BUILD_DATE}"
 
 # Environment settings
 ENV HOME="/config"
@@ -33,7 +37,7 @@ RUN \
 	libxslt-dev \
 	make \
 	mercurial \
-	openssl-dev \
+	libressl-dev \
 	patch \
 	perl-dev \
 	pkgconf \
@@ -52,18 +56,24 @@ RUN \
 	libcurl	\
 	libssl1.0 \
 	linux-headers \
-	openssl \
+	libressl \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
 	perl-capture-tiny \
 	perl-cgi \
 	perl-compress-raw-zlib \
+	perl-data-dumper \
 	perl-date-manip \
 	perl-datetime \
+	perl-datetime-format-strptime \
+	perl-datetime-timezone \
+	perl-dbd-sqlite \
+	perl-dbi \
 	perl-digest-sha1 \
 	perl-file-slurp \
 	perl-file-temp \
+	perl-file-which \
 	perl-getopt-long \
 	perl-html-parser \
 	perl-html-tree \
@@ -71,26 +81,61 @@ RUN \
 	perl-io \
 	perl-io-compress \
 	perl-io-html \
+	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
 	perl-libwww \
+	perl-lingua-en-numbers-ordinate \
+	perl-lingua-preferred \
+	perl-list-moreutils \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
 	perl-parse-recdescent \
 	perl-path-class \
+	perl-scalar-list-utils \
+	perl-term-progressbar \
 	perl-term-readkey \
 	perl-test-exception \
 	perl-test-requires \
+	perl-timedate \
 	perl-try-tiny \
+	perl-unicode-string \
+	perl-xml-libxml \
+	perl-xml-libxslt \
 	perl-xml-parser \
 	perl-xml-sax \
+	perl-xml-treepp \
+	perl-xml-twig \
+	perl-xml-writer \
 	python \
 	tar \
 	uriparser \
 	wget \
 	zlib && \
 
+# install perl modules for xmltv
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
+ cpanm DateTime::Format::ISO8601 && \
+ cpanm DateTime::Format::SQLite && \
+ cpanm Encode && \
+ cpanm File::HomeDir && \
+ cpanm File::Path && \
+ cpanm HTML::Entities && \
+ cpanm HTML::TableExtract && \
+ cpanm HTTP::Cache::Transparent && \
+ cpanm inc && \
+ cpanm JSON::PP && \
+ cpanm LWP::Simple && \
+ cpanm LWP::UserAgent && \
+ cpanm PerlIO::gzip && \
+ cpanm SOAP::Lite && \
+ cpanm Storable && \
+ cpanm Unicode::UTF8simple && \
+ cpanm version && \
+ cpanm WWW::Mechanize && \
+ cpanm XML::DOM && \
+
 # build libiconv
  mkdir -p \
  /tmp/iconv-src && \
@@ -108,59 +153,11 @@ RUN \
  make install && \
  libtool --finish /usr/local/lib && \
 
-# install perl modules
- curl -L http://cpanmin.us | perl - App::cpanminus && \
- cpanm Date::Language && \
- cpanm DateTime::Format::ISO8601 && \
- cpanm DateTime::Format::Strptime && \
- cpanm HTML::Entities && \
- cpanm HTML::TableExtract && \
- cpanm HTML::TreeBuilder && \
- cpanm HTTP::Cache::Transparent && \
- cpanm inc && \
- cpanm IO::Scalar && \
- cpanm IO::Socket::SSL && \
- cpanm JSON::PP && \
- cpanm Lingua::EN::Numbers::Ordinate && \
- cpanm Lingua::Preferred && \
- cpanm List::MoreUtils && \
- cpanm LWP::Simple && \
- cpanm LWP::UserAgent && \
- cpanm PerlIO::gzip && \
- cpanm SOAP::Lite && \
- cpanm Storable && \
- cpanm Term::ProgressBar && \
- cpanm Unicode::UTF8simple && \
- cpanm version && \
- cpanm WWW::Mechanize && \
- cpanm XML::DOM && \
- cpanm XML::LibXML && \
- cpanm XML::LibXSLT && \
- cpanm XML::TreePP && \
- cpanm XML::Twig && \
- cpanm XML::Writer && \
-
-# patch and build perl-unicode-string
- mkdir -p \
-	/tmp/unicode && \
- curl -o \
- /tmp/unicode-src.tar.gz -L \
-	"http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-${UNICODE_VER}.tar.gz" && \
- tar xzf /tmp/unicode-src.tar.gz -C \
-	/tmp/unicode --strip-components=1 && \
- cd /tmp/unicode/lib/Unicode && \
- patch -i /tmp/patches/perl-unicode.patch && \
- cd /tmp/unicode && \
- perl Makefile.PL && \
- make && \
- make test && \
- make install && \
-
 # build dvb-apps
  hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
  cd /tmp/dvb-apps && \
- make && \
- make install && \
+ make -C lib && \
+ make -C lib install && \
 
 # build tvheadend
  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
@@ -183,7 +180,7 @@ RUN \
 	--prefix=/usr \
 	--sysconfdir=/config && \
  make && \
- make install && \
+ make install && \	
 
 # build XMLTV
  curl -o /tmp/xmtltv-src.tar.bz2 -L \
@@ -240,6 +237,9 @@ RUN \
 # copy local files
 COPY root/ /
 
+# add picons
+ADD picons.tar.bz2 /picons
+
 # ports and volumes
 EXPOSE 9981 9982
 VOLUME /config /recordings

README.md

@@ -2,6 +2,8 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://www.tvheadend.org/
+[hub]: https://hub.docker.com/r/linuxserver/tvheadend/
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
@@ -11,15 +13,14 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # linuxserver/tvheadend
-[![](https://images.microbadger.com/badges/image/linuxserver/tvheadend.svg)](http://microbadger.com/images/linuxserver/tvheadend "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/)
-[hub]: https://hub.docker.com/r/linuxserver/tvheadend/
+[![](https://images.microbadger.com/badges/version/linuxserver/tvheadend.svg)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/tvheadend.svg)](http://microbadger.com/images/linuxserver/tvheadend "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/)
+
 
 [Tvheadend](https://www.tvheadend.org/) is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
 Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
 Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).
 
-[![tvheadend](https://s31.postimg.io/8urk8vdu3/logobig.png)][tvheadendurl]
-[tvheadendurl]: https://www.tvheadend.org/
+[![tvheadend](https://s31.postimg.io/8urk8vdu3/logobig.png)][appurl]
 
 ## Usage
 
@@ -28,7 +29,9 @@ docker create \
   --name=tvheadend \
   --net=bridge \
   -v <path to data>:/config \
+  -v <path to recordings>:/recordings \
   -e PGID=<gid> -e PUID=<uid>  \
+  -e RUN_OPTS=<parameter> \
   -p 9981:9981 \
   -p 9982:9982 \
   --device=/dev/dvb
@@ -49,12 +52,20 @@ Add one of the tags, if required, to the linuxserver/tvheadend line of the run/c
 
 If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.
 
-**Parameters**
+## Parameters
+
+`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
+For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
+So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
+http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
+
 
 * `-p 1234` - the port(s)
-* `-v /config` - explain what lives here
+* `-v /config` - Where TVHeadend show store it's config files
+* `-v /recordings` - Where you want the PVR to store recordings
 * `-e PGID` for GroupID - see below for explanation
 * `-e PUID` for UserID - see below for explanation
+* `-e RUN_OPTS` additional runtime parameters - see below for explanation
 * `--device=/dev/dvb` - for passing through DVB-cards
 * `--net=host` - for IPTV, SAT>IP and HDHomeRun
 * `-e TZ` - for timezone information *eg Europe/London, etc*
@@ -72,6 +83,11 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
     uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
 ```
 
+## Additional runtime parameters
+
+In some cases it might be necessary to start tvheadend with additional parameters, for example to enable debugging or specify webroot for reverse proxy. Be sure to have the right parameters set, as adding the wrong once might lead to the container not starting correctly.
+
+
 ## Setting up the application
 
 The setup depends if you run the one of the stable tags or use latest. Running latest is the easiest as it has a setup wizard.
@@ -121,7 +137,12 @@ If you have EPG data in XML format from a supplier, you can drop it in the data
 If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above.
 The xml file has to be named guide.xml.
 
-For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
+For advanced setup of tvheadend, go to [Tvheadend][appurl]
+
+**Picons**
+
+We have added all the picons from [picons.xyz](https://picons.xyz/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
+You need to enable minimum advanced view level to see the picons options.
 
 ## Info
 
@@ -130,6 +151,10 @@ For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
 
 ## Versions
 
++ **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
++ **07.02.2017:** Add variable to add additional runtime paramters.
++ **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
++ **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.
 + **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
 + **18.09.2016:** Update XMLTV to 0.5.68 and update README.
 + **10.09.2016:** Add layer badges to README.

patches/perl-unicode.patch

@@ -1,11 +0,0 @@
---- CharName.pm	2005-10-25 20:11:00.000000000 +0200
-+++ CharName.pm.mod	2016-08-12 23:25:51.752348000 +0200
-@@ -77,7 +77,7 @@
- 	    return join("", "HANGUL SYLLABLE ", @s)
- 	}
-     }
--    _init_names() unless defined %NAMES;
-+    _init_names() unless %NAMES;
-     $NAMES{sprintf("%04X",$code)}
- }
- 

root/etc/cont-init.d/30-config

@@ -12,4 +12,5 @@ mkdir -p \
 
 # permissions
 chown -R abc:abc \
-	/config
+	/config \
+	/picons

root/etc/services.d/tvheadend/run

@@ -1,3 +1,6 @@
 #!/usr/bin/with-contenv bash
+
+RUN_ARRAY=(${RUN_OPTS})
+
 exec \
-	s6-setuidgid abc /usr/bin/tvheadend -C -c /config
+        s6-setuidgid abc /usr/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"