Merge pull request #54 from linuxserver/alpine_3.6

bump to alpine 3.6

Dockerfile

@@ -1,9 +1,8 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER saarg
 
 # package version
 ARG ARGTABLE_VER="2.13"
-ARG FFMPEG_VER="ffmpeg"
 ARG TZ="Europe/Oslo"
 ARG XMLTV_VER="0.5.69"
 
@@ -12,18 +11,7 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Build-date:- ${BUILD_DATE}"
 
-# Environment settings
+# environment settings
-ENV HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches/
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Build-date:- ${BUILD_DATE}"
-
-# Environment settings
 ENV HOME="/config"
 
 # copy patches
@@ -36,7 +24,7 @@ RUN \
 	automake \
 	cmake \
 	coreutils \
-	${FFMPEG_VER}-dev \
+	ffmpeg-dev \
 	file \
 	findutils \
 	g++ \
@@ -52,6 +40,7 @@ RUN \
 	mercurial \
 	libressl-dev \
 	patch \
+	pcre2-dev \
 	perl-dev \
 	pkgconf \
 	sdl-dev \
@@ -62,7 +51,6 @@ RUN \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev && \
 
-
 # add runtime dependencies required in build stage
  apk add --no-cache \
 	bsd-compat-headers \
@@ -71,9 +59,10 @@ RUN \
 	gzip \
 	libcrypto1.0 \
 	libcurl	\
+	libressl \
 	libssl1.0 \
 	linux-headers \
-	libressl \
+	pcre2 \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
@@ -88,6 +77,7 @@ RUN \
 	perl-dbd-sqlite \
 	perl-dbi \
 	perl-digest-sha1 \
+	perl-doc \
 	perl-file-slurp \
 	perl-file-temp \
 	perl-file-which \
@@ -203,8 +193,8 @@ RUN \
 
 # install runtime packages
  apk add --no-cache \
-	${FFMPEG_VER} \
+	ffmpeg \
-	${FFMPEG_VER}-libs \
+	ffmpeg-libs \
 	libhdhomerun-libs \
 	libxml2 \
 	libxslt && \

README.md

@@ -20,7 +20,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 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)][appurl]
+[![tvheadend](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/tvheadend-big.png)][appurl]
 
 ## Usage
 
@@ -42,11 +42,12 @@ The --device=/dev/dvb is only needed if you want to pass through a DVB card to t
 
 You can choose between ,using tags, latest (default, and no tag required or a specific stable version of tvheadend.
 
-Add one of the tags, if required, to the linuxserver/tvheadend line of the run/create command in the following format, linuxserver/tvheadend:stable-4.0.9
+Add one of the tags, if required, to the linuxserver/tvheadend line of the run/create command in the following format, linuxserver/tvheadend:stable-4.2.1
 
 #### Tags
 
-+ **stable-4.0.9** : latest stable version.
++ **stable-4.2.1** : latest stable version.
++ **stable-4.0.9** : old stable version. Will not be updated anymore!
 
 #### Host vs. Bridge
 
@@ -149,8 +150,18 @@ You need to enable minimum advanced view level to see the picons options.
 * Shell access whilst the container is running: `docker exec -it tvheadend /bin/bash`
 * To monitor the logs of the container in realtime: `docker logs -f tvheadend`
 
+* container version number 
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' tvheadend`
+
+* image version number
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/tvheadend`
+
 ## Versions
 
++ **27.05.2017:** Rebase to alpine 3.6.
++ **01.05.2017:** Update to tvheadend 4.2.1 stable.
 + **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
 + **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
 + **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.