diff --git a/Dockerfile b/Dockerfile index 14169c0..42e01b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ FROM lsiobase/alpine:3.5 MAINTAINER saarg -# package version +# package version ARG ARGTABLE_VER="2.13" +ARG FFMPEG_VER="ffmpeg" +ARG TZ="Europe/Oslo" ARG XMLTV_VER="0.5.69" # set version label @@ -13,7 +15,18 @@ LABEL build_version="Build-date:- ${BUILD_DATE}" # Environment settings ENV HOME="/config" -# copy patches +# 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 @@ -23,7 +36,7 @@ RUN \ automake \ cmake \ coreutils \ - ffmpeg-dev \ + ${FFMPEG_VER}-dev \ file \ findutils \ g++ \ @@ -116,27 +129,9 @@ RUN \ # 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 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 && \ - cpanm HTTP::Cache::Transparent && \ + cpanm --installdeps /tmp/patches && \ -# build libiconv +# build libiconv mkdir -p \ /tmp/iconv-src && \ curl -o \ @@ -193,7 +188,7 @@ RUN \ make test && \ make install && \ -# build argtable2 +# build argtable2 ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \ mkdir -p \ /tmp/argtable && \ @@ -209,7 +204,7 @@ RUN \ make check && \ make install && \ -# build comskip +# build comskip git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \ cd /tmp/comskip && \ ./autogen.sh && \ @@ -221,8 +216,8 @@ RUN \ # install runtime packages apk add --no-cache \ - ffmpeg \ - ffmpeg-libs \ + ${FFMPEG_VER} \ + ${FFMPEG_VER}-libs \ libhdhomerun-libs \ libxml2 \ libxslt && \ diff --git a/README.md b/README.md index d98d67f..004aa40 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,7 @@ You need to enable minimum advanced view level to see the picons options. ## Versions ++ **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. + **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. diff --git a/patches/cpanfile b/patches/cpanfile new file mode 100644 index 0000000..02fa44c --- /dev/null +++ b/patches/cpanfile @@ -0,0 +1,22 @@ +requires 'perl' => '5.24.0'; + +# perl packages for tvheadend x86 +requires 'DateTime::Format::ISO8601' ; +requires 'DateTime::Format::SQLite' ; +requires 'Encode' ; +requires 'File::HomeDir' ; +requires 'File::Path' ; +requires 'HTML::Entities' ; +requires 'HTML::TableExtract' ; +requires 'HTTP::Cache::Transparent' => ">= 1.3, != 1.4" ; +requires 'inc' ; +requires 'JSON::PP' ; +requires 'LWP::Simple' ; +requires 'LWP::UserAgent' ; +requires 'PerlIO::gzip' ; +requires 'SOAP::Lite' ; +requires 'Storable' ; +requires 'Unicode::UTF8simple' ; +requires 'version' ; +requires 'WWW::Mechanize' ; +requires 'XML::DOM' ;