From 9b161c87f9735284c05010565f1c69dd539a4163 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Sun, 2 Jul 2017 16:50:26 +0200 Subject: [PATCH 1/4] Update README with new branch --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4674679..8b63fe1 100644 --- a/README.md +++ b/README.md @@ -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.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. ++ **stable-4.2** : latest stable version from 4.2 branch. Freshly built every friday night CET. ++ **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 @@ -160,6 +161,7 @@ You need to enable minimum advanced view level to see the picons options. ## 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. From 0e8ea6063c8020b4989d20b25a6abf5282c4129f Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 2 Jul 2017 16:03:09 +0100 Subject: [PATCH 2/4] change branch for release 4.2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b63fe1..ad8d642 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Add one of the tags, if required, to the linuxserver/tvheadend line of the run/c #### Tags -+ **stable-4.2** : latest stable version from 4.2 branch. Freshly built every friday night CET. ++ **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! From e4e07121afd34d8d0b4f3692c37541486b298212 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 3 Jul 2017 11:34:18 +0100 Subject: [PATCH 3/4] tidy up Dockerfile and use only one install run for runtime packages --- Dockerfile | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7ca42f..3481b05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG BUILD_DATE ARG VERSION LABEL build_version="Build-date:- ${BUILD_DATE}" -# environment settings +# Environment settings ENV HOME="/config" # copy patches @@ -23,7 +23,6 @@ RUN \ autoconf \ automake \ cmake \ - coreutils \ ffmpeg-dev \ file \ findutils \ @@ -31,14 +30,14 @@ RUN \ 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 \ @@ -51,16 +50,21 @@ 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 \ + libhdhomerun-libs \ libressl \ libssl1.0 \ + libxml2 \ + libxslt \ linux-headers \ pcre2 \ perl \ @@ -120,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 && \ @@ -155,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 && \ @@ -172,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 \ @@ -191,17 +201,6 @@ RUN \ make && \ make install && \ -# install runtime packages - apk add --no-cache \ - ffmpeg \ - ffmpeg-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 && \ From bdc1f87ac6104ed6fd85ba786c1dbd6bfe2c3136 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 3 Jul 2017 12:05:15 +0100 Subject: [PATCH 4/4] tidy up dockerfile edit README with changes to release branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad8d642..e7a3e17 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ 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