diff --git a/Dockerfile b/Dockerfile index 30b3475..706e2c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.10 as buildstage +FROM lsiobase/alpine:3.11 as buildstage ############## build stage ############## # package versions @@ -128,6 +128,8 @@ RUN \ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ cd /tmp/xmltv && \ git checkout ${XMLTV_VER} && \ + echo "**** Fix test for xmltv alpine 3.11 ****" && \ + patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \ 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 && \ @@ -220,7 +222,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM lsiobase/alpine:3.10 +FROM lsiobase/alpine:3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f191581..af12cc7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -127,6 +127,8 @@ RUN \ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ cd /tmp/xmltv && \ git checkout ${XMLTV_VER} && \ + echo "**** Fix test for xmltv alpine 3.11 ****" && \ + patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \ 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 && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9198e58..2deba6b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -127,6 +127,8 @@ RUN \ git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ cd /tmp/xmltv && \ git checkout ${XMLTV_VER} && \ + echo "**** Fix test for xmltv alpine 3.11 ****" && \ + patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \ 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 && \ diff --git a/README.md b/README.md index c28b45b..d3ee351 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ [![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") -[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -20,19 +20,15 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. -* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend) - -[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-tvheadend) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-tvheadend/releases) -[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-tvheadend/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-tvheadend/container_registry) -[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/tvheadend) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-tvheadend/releases) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/tvheadend) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/tvheadend) +[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend) [![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html) @@ -142,18 +138,6 @@ Container images are configured using parameters passed at runtime (such as thos | `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). | | `--device /dev/dvb` | 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. | -## Environment variables from files (Docker secrets) - -You can set any environment variable from a file by using a special prepend `FILE__`. - -As an example: - -``` --e FILE__PASSWORD=/run/secrets/mysecretpassword -``` - -Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. - ## User / Group Identifiers When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. @@ -295,6 +279,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.12.19:** - Update to Alpine 3.11. * **02.10.19:** - Improve permission fixing on render & dvb devices. * **18.08.19:** - Add AMD drivers. * **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb. diff --git a/patches/test_tv_imdb.t.patch b/patches/test_tv_imdb.t.patch new file mode 100644 index 0000000..3e31bad --- /dev/null +++ b/patches/test_tv_imdb.t.patch @@ -0,0 +1,20 @@ +--- + t/test_tv_imdb.t | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t +index ad504464..4dc281a1 100755 +--- a/t/test_tv_imdb.t ++++ b/t/test_tv_imdb.t +@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) { + my $output="$tmpDir/".File::Basename::basename($input)."-output.xml"; + + # Make temporary directory and split into it. +- my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1"; ++ my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1"; + if ( $input=~m/movies-only/ ) { +- $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1"; ++ $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1"; + } + #print STDERR "\nRUN:$cmd\n"; + my $r = system($cmd); \ No newline at end of file diff --git a/readme-vars.yml b/readme-vars.yml index bf1b9a5..0e77f2a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -126,6 +126,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.12.19:", desc: "Update to Alpine 3.11." } - { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." } - { date: "18.08.19:", desc: "Add AMD drivers." } - { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }