Merge pull request #56 from linuxserver/readme

Update README with new branch

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,7 +11,7 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Build-date:- ${BUILD_DATE}"
 
-# environment settings
+# Environment settings
 ENV HOME="/config"
 
 # copy patches
@@ -24,23 +23,23 @@ RUN \
 	autoconf \
 	automake \
 	cmake \
-	coreutils \
-	${FFMPEG_VER}-dev \
+	ffmpeg-dev \
 	file \
 	findutils \
 	g++ \
 	gcc \
 	gettext-dev \
 	git \
-	libhdhomerun-dev \
 	libgcrypt-dev \
+	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
 	libxml2-dev \
 	libxslt-dev \
 	make \
 	mercurial \
-	libressl-dev \
 	patch \
+	pcre2-dev \
 	perl-dev \
 	pkgconf \
 	sdl-dev \
@@ -51,17 +50,23 @@ RUN \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev && \
 
-# add runtime dependencies required in build stage
+# install runtime packages
  apk add --no-cache \
 	bsd-compat-headers \
 	bzip2 \
 	curl \
+	ffmpeg \
+	ffmpeg-libs \
 	gzip \
 	libcrypto1.0 \
 	libcurl	\
-	libssl1.0 \
-	linux-headers \
+	libhdhomerun-libs \
 	libressl \
+	libssl1.0 \
+	libxml2 \
+	libxslt \
+	linux-headers \
+	pcre2 \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
@@ -76,6 +81,7 @@ RUN \
 	perl-dbd-sqlite \
 	perl-dbi \
 	perl-digest-sha1 \
+	perl-doc \
 	perl-file-slurp \
 	perl-file-temp \
 	perl-file-which \
@@ -118,6 +124,9 @@ RUN \
 	uriparser \
 	wget \
 	zlib && \
+ apk add --no-cache \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
+	gnu-libiconv && \
 
 # install perl modules for xmltv
  curl -L http://cpanmin.us | perl - App::cpanminus && \
@@ -153,12 +162,14 @@ RUN \
  make install && \
 
 # build XMLTV
- curl -o /tmp/xmtltv-src.tar.bz2 -L \
+ curl -o \
+ /tmp/xmtltv-src.tar.bz2 -L \
 	"http://kent.dl.sourceforge.net/project/xmltv/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
- tar xf /tmp/xmtltv-src.tar.bz2 -C \
+ tar xf \
+ /tmp/xmtltv-src.tar.bz2 -C \
 	/tmp --strip-components=1 && \
  cd "/tmp/xmltv-${XMLTV_VER}" && \
- /bin/echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
+ echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
  make && \
  make test && \
  make install && \
@@ -170,7 +181,8 @@ RUN \
  curl -o \
  /tmp/argtable-src.tar.gz -L \
 	"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
- tar xf /tmp/argtable-src.tar.gz -C \
+ tar xf \
+ /tmp/argtable-src.tar.gz -C \
 	/tmp/argtable --strip-components=1 && \
  cd /tmp/argtable && \
  ./configure \
@@ -189,17 +201,6 @@ RUN \
  make && \
  make install && \
 
-# install runtime packages
- apk add --no-cache \
-	${FFMPEG_VER} \
-	${FFMPEG_VER}-libs \
-	libhdhomerun-libs \
-	libxml2 \
-	libxslt && \
- apk add --no-cache \
-	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	gnu-libiconv && \
-
 # cleanup
  apk del --purge \
 	build-dependencies && \

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
 
@@ -40,13 +40,14 @@ docker create \
 The --device=/dev/dvb is only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out.
 
 
-You can choose between ,using tags, latest (default, and no tag required or a specific stable version of tvheadend.
+You can choose between ,using tags, latest (default, and no tag required or a specific release branch 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.2.1
+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
 
 #### Tags
 
-+ **stable-4.2.1** : latest stable version.
++ **release-4.2** : latest release from 4.2 branch. Freshly built every friday night uk time.
++ **stable-4.2.1** : old stable version. Will not be updated anymore!
 + **stable-4.0.9** : old stable version. Will not be updated anymore!
 
 #### Host vs. Bridge
@@ -150,8 +151,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
 
++ **02.07.2017:** Move to one branch for all 4.2 releases.
++ **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.