Merge pull request #94 from linuxserver/rebase_alpine_3.8

rebase to alpine 3.8 and use buildstage type build

Dockerfile

@@ -1,79 +1,253 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.8 as buildstage
-MAINTAINER saarg
+############## build stage ##############
 
-# package version
+# package versions
 ARG ARGTABLE_VER="2.13"
-ARG FFMPEG_VER="ffmpeg"
-ARG TZ="Europe/Oslo"
 ARG XMLTV_VER="0.5.69"
 
-# set version label
+# environment settings
-ARG BUILD_DATE
+ARG TZ="Europe/Oslo"
-ARG VERSION
-LABEL build_version="Build-date:- ${BUILD_DATE}"
-
-# 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
-COPY patches/ /tmp/patches/
-
-# install build packages
 RUN \
- apk add --no-cache --virtual=build-dependencies \
+ echo "**** install build packages ****" && \
+ apk add --no-cache \
 	autoconf \
 	automake \
+	bsd-compat-headers \
+	bzip2 \
 	cmake \
-	coreutils \
+	curl \
-	${FFMPEG_VER}-dev \
+	ffmpeg-dev \
 	file \
 	findutils \
 	g++ \
 	gcc \
 	gettext-dev \
 	git \
-	libhdhomerun-dev \
+	gzip \
+	libcurl \
+	libdvbcsa-dev \
 	libgcrypt-dev \
+	libhdhomerun-dev \
 	libtool \
+	libva-dev \
+	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
+	linux-headers \
 	make \
-	mercurial \
+	openssl-dev \
-	libressl-dev \
+	opus-dev \
 	patch \
+	pcre2-dev \
+	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-dev \
+	perl-digest-sha1 \
+	perl-doc \
+	perl-file-slurp \
+	perl-file-temp \
+	perl-file-which \
+	perl-getopt-long \
+	perl-html-parser \
+	perl-html-tree \
+	perl-http-cookies \
+	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 \
 	pkgconf \
+	pngquant \
+	python \
 	sdl-dev \
+	tar \
 	uriparser-dev \
 	wget \
+	x264-dev \
+	x265-dev \
 	zlib-dev && \
- apk add --no-cache --virtual=build-dependencies \
+ apk add --no-cache \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
-	gnu-libiconv-dev && \
+	gnu-libiconv-dev
 
+RUN \
+ echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
+ rm -rf /usr/include/iconv.h && \
+ cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h
 
-# add runtime dependencies required in build stage
+RUN \
+ echo "**** install perl modules for xmltv ****" && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
+ cpanm --installdeps /tmp/patches
+
+RUN \
+ echo "**** compile XMLTV ****" && \
+ curl -o \
+ /tmp/xmtltv-src.tar.bz2 -L \
+	"https://sourceforge.net/projects/xmltv/files/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
+ tar xf \
+ /tmp/xmtltv-src.tar.bz2 -C \
+	/tmp --strip-components=1 && \
+ cd "/tmp/xmltv-${XMLTV_VER}" && \
+ echo "**** Perl 5.26 fixes for XMTLV ****" && \
+ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
+ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
+ sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
+ sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
+ sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
+ sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
+ PERL5LIB=`pwd` && \
+ echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
+ make && \
+ make test && \
+ make DESTDIR=/tmp/xmltv-build install
+
+RUN \
+ echo "**** compile tvheadend ****" && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ ./configure \
+	`#Encoding` \
+	--disable-ffmpeg_static \
+	--disable-libfdkaac_static \
+	--disable-libtheora_static \
+	--disable-libopus_static \
+	--disable-libvorbis_static \
+	--disable-libvpx_static \
+	--disable-libx264_static \
+	--disable-libx265_static \
+	--disable-libfdkaac \
+	--enable-libopus \
+	--enable-libvorbis \
+	--enable-libvpx \
+	--enable-libx264 \
+	--enable-libx265 \
+	\
+	`#Options` \
+	--disable-avahi \
+	--disable-dbus_1 \
+	--disable-bintray_cache \
+	--disable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-libav \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi \
+	--infodir=/usr/share/info \
+	--localstatedir=/var \
+	--mandir=/usr/share/man \
+	--prefix=/usr \
+	--sysconfdir=/config && \
+ make && \
+ make DESTDIR=/tmp/tvheadend-build install
+
+RUN \
+ echo "**** compile argtable2 ****" && \
+ ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
+ mkdir -p \
+	/tmp/argtable && \
+ 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 \
+	/tmp/argtable --strip-components=1 && \
+ cp /tmp/patches/config.* /tmp/argtable && \
+ cd /tmp/argtable && \
+ ./configure \
+	--prefix=/usr && \
+ make && \
+ make check && \
+ make DESTDIR=/tmp/argtable-build install && \
+ echo "**** copy to /usr for comskip dependency ****" && \
+ cp -pr /tmp/argtable-build/usr/* /usr/
+
+RUN \
+ echo "***** compile comskip ****" && \
+ git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ cd /tmp/comskip && \
+ ./autogen.sh && \
+ ./configure \
+	--bindir=/usr/bin \
+	--sysconfdir=/config/comskip && \
+ make && \
+ make DESTDIR=/tmp/comskip-build install
+
+############## runtime stage ##############
+FROM lsiobase/alpine:3.8
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="saarg"
+
+# environment settings
+ENV HOME="/config"
+
+RUN \
+ echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	bsd-compat-headers \
 	bzip2 \
 	curl \
+	ffmpeg \
+	ffmpeg-libs \
 	gzip \
 	libcrypto1.0 \
-	libcurl	\
+	libcurl \
+	libdvbcsa \
+	libhdhomerun-libs \
 	libssl1.0 \
+	libva \
+	libva-intel-driver \
+	libvpx \
+	libxml2 \
+	libxslt \
 	linux-headers \
-	libressl \
+	openssl \
+	opus \
+	pcre2 \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
@@ -88,6 +262,7 @@ RUN \
 	perl-dbd-sqlite \
 	perl-dbi \
 	perl-digest-sha1 \
+	perl-doc \
 	perl-file-slurp \
 	perl-file-temp \
 	perl-file-which \
@@ -129,97 +304,20 @@ RUN \
 	tar \
 	uriparser \
 	wget \
+	x264 \
+	x265 \
 	zlib && \
-
-# install perl modules for xmltv
- curl -L http://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches && \
-
-# build dvb-apps
- hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
- cd /tmp/dvb-apps && \
- make -C lib && \
- make -C lib install && \
-
-# build tvheadend
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- ./configure \
-	--disable-ffmpeg_static \
-	--disable-hdhomerun_static \
-	--disable-libfdkaac_static \
-	--disable-libmfx_static \
-	--disable-libtheora_static \
-	--disable-libvorbis_static \
-	--disable-libvpx_static \
-	--disable-libx264_static \
-	--disable-libx265_static \
-	--enable-hdhomerun_client \
-	--enable-libav \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/config && \
- make && \
- make install && \
-
-# build XMLTV
- 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 \
-	/tmp --strip-components=1 && \
- cd "/tmp/xmltv-${XMLTV_VER}" && \
- /bin/echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
- make && \
- make test && \
- make install && \
-
-# build argtable2
- ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
- mkdir -p \
-	/tmp/argtable && \
- 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 \
-	/tmp/argtable --strip-components=1 && \
- cd /tmp/argtable && \
- ./configure \
-	--prefix=/usr && \
- make && \
- make check && \
- make install && \
-
-# build comskip
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
- cd /tmp/comskip && \
- ./autogen.sh && \
- ./configure \
-	--bindir=/usr/bin \
-	--sysconfdir=/config/comskip && \
- 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 && \
+	gnu-libiconv
 
-# cleanup
+# copy local files and buildstage artifacts
- apk del --purge \
+COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
-	build-dependencies && \
+COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
- rm -rf \
+COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-	/config/.cpanm \
+COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-	/tmp/*
+COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
-
+COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
-# copy local files
 COPY root/ /
 
 # add picons

README.md

@@ -13,14 +13,13 @@ 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/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/)
+[![](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)](https://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](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-tvheadend)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-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)][appurl]
+[![tvheadend](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/tvheadend-big.png)][appurl]
 
 ## Usage
 
@@ -34,19 +33,22 @@ docker create \
   -e RUN_OPTS=<parameter> \
   -p 9981:9981 \
   -p 9982:9982 \
-  --device=/dev/dvb
+  --device=/dev/dvb \
+  --device=/dev/dri
   linuxserver/tvheadend
 ```
 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.
+The --device=/dev/dri is only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi).
 
+You can choose between ,using tags, latest (default, and no tag required or a specific release branch of tvheadend.
 
-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:release-4.2
-
-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
 
 #### Tags
 
-+ **stable-4.0.9** : 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
 
@@ -67,6 +69,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
 * `-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
+* `--device=/dev/dri` - for passing through GPU
 * `--net=host` - for IPTV, SAT>IP and HDHomeRun
 * `-e TZ` - for timezone information *eg Europe/London, etc*
 
@@ -121,7 +124,7 @@ This container comes with Comskip for commercial flagging of recordings. This yo
 Go to Configuration --> Recording. Change the view level to advanced in the top right corner, and add the below in the Post-processor command field.
 
 ```
-comskip --ini=/config/comskip/comskip.ini "%f"
+/usr/bin/comskip --ini=/config/comskip/comskip.ini "%f"
 ```
 
 Now comskip will run after each recording is finished. You will find comskip.ini in the comskip folder of your /config volume mapping. See the [Comskip](http://www.kaashoek.com/comskip/) homepage for tuning of the ini file.
@@ -149,15 +152,38 @@ 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
 
-+ **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
++ **12.09.18:** Rebase to alpine 3.8 and use buildstage type build.
-+ **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
++ **21.04.18:** Add JSON::XS Perl package for grab_tv_huro.
-+ **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
++ **24.03.18:** Add dvbcsa package.
-+ **07.02.2017:** Add variable to add additional runtime paramters.
++ **04.03.18:** Use sourceforge master rather than mirror for xmltv.
-+ **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
++ **22.02.18:** Add lost libva-intel-driver.
-+ **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.
++ **21.02.18:** Fix wrong version of iconv used.
-+ **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
++ **18.02.18:** Add vaapi support, some cleanup and dropping of deprecated options.
-+ **18.09.2016:** Update XMLTV to 0.5.68 and update README.
++ **04.01.18:** Deprecate cpu_core routine lack of scaling.
-+ **10.09.2016:** Add layer badges to README.
++ **11.12.17:** Rebase to alpine 3.7, linting fixes.
-+ **05.09.2016:** Initial release.
++ **02.09.17:** Add codec dependencies.
++ **13.07.17:** Increase uniformity across all archs.
++ **08.07.17:** Update README with full path for comskip.
++ **02.07.17:** Move to one branch for all 4.2 releases.
++ **27.05.17:** Rebase to alpine 3.6.
++ **01.05.17:** Update to tvheadend 4.2.1 stable.
++ **18.04.17:** Use repo version of gnu-libiconv rather than compiling.
++ **09.04.17:** Chain cpanm installs in one block and use --installdeps.
++ **09.02.17:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
++ **07.02.17:** Add variable to add additional runtime paramters.
++ **05.02.17:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
++ **14.11.16:** Add picons from picons.xyz to /picons folder and add info to README.
++ **22.09.16:** Fix broken tv_grab_wg, libs for xmltv and update README.
++ **18.09.16:** Update XMLTV to 0.5.68 and update README.
++ **10.09.16:** Add layer badges to README.
++ **05.09.16:** Initial release.

patches/cpanfile

@@ -11,6 +11,7 @@ requires 'HTML::TableExtract' ;
 requires 'HTTP::Cache::Transparent' => ">= 1.3, != 1.4" ;
 requires 'inc' ;
 requires 'JSON::PP' ;
+requires 'JSON::XS' ;
 requires 'LWP::Simple' ;
 requires 'LWP::UserAgent' ;
 requires 'PerlIO::gzip' ;

patches/libiconv-1-fixes.patch

@@ -1,46 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 47345f5dcfb91da8afed7c4e6c29faa2056db447 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 7 Jun 2013 17:44:24 +1000
-Subject: [PATCH] remove gets since c++11 removed it
- https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00186.html
-
-
-diff --git a/srclib/stdio.in.h b/srclib/stdio.in.h
-index 473c84c..dfb59eb 100644
---- a/srclib/stdio.in.h
-+++ b/srclib/stdio.in.h
-@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
--- 
-1.8.2.3
-

root/etc/services.d/tvheadend/run

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