diff --git a/Dockerfile b/Dockerfile index 28b0fd3..007eee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage ############## build stage ############## # package versions ARG ARGTABLE_VER="2.13" -ARG XMLTV_VER="v0.6.3" +ARG XMLTV_VER="v1.0.0" # environment settings ARG TZ="Europe/Oslo" @@ -52,7 +52,6 @@ RUN \ perl-capture-tiny \ perl-cgi \ perl-compress-raw-zlib \ - perl-data-dumper \ perl-date-manip \ perl-datetime \ perl-datetime-format-strptime \ @@ -70,7 +69,6 @@ RUN \ perl-html-tree \ perl-http-cookies \ perl-io \ - perl-io-compress \ perl-io-html \ perl-io-socket-ssl \ perl-io-stringy \ @@ -103,7 +101,7 @@ RUN \ perl-xml-writer \ pkgconf \ pngquant \ - python2 \ + python3 \ sdl-dev \ tar \ uriparser-dev \ @@ -172,6 +170,7 @@ RUN \ --disable-avahi \ --disable-dbus_1 \ --disable-bintray_cache \ + --disable-execinfo \ --disable-hdhomerun_static \ --enable-hdhomerun_client \ --enable-libav \ @@ -182,6 +181,7 @@ RUN \ --localstatedir=/var \ --mandir=/usr/share/man \ --prefix=/usr \ + --python=python3 \ --sysconfdir=/config && \ make -j 2 && \ make DESTDIR=/tmp/tvheadend-build install @@ -219,7 +219,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 # set version label ARG BUILD_DATE @@ -262,7 +262,6 @@ RUN \ perl-capture-tiny \ perl-cgi \ perl-compress-raw-zlib \ - perl-data-dumper \ perl-date-manip \ perl-datetime \ perl-datetime-format-strptime \ @@ -279,7 +278,6 @@ RUN \ perl-html-tree \ perl-http-cookies \ perl-io \ - perl-io-compress \ perl-io-html \ perl-io-socket-ssl \ perl-io-stringy \ @@ -311,7 +309,7 @@ RUN \ perl-xml-twig \ perl-xml-writer \ py3-requests \ - python2 \ + python3 \ tar \ uriparser \ wget \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c2be166..cf2cdf4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,9 +1,9 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as buildstage ############## build stage ############## # package versions ARG ARGTABLE_VER="2.13" -ARG XMLTV_VER="v0.6.3" +ARG XMLTV_VER="v1.0.0" # environment settings ARG TZ="Europe/Oslo" @@ -51,7 +51,6 @@ RUN \ perl-capture-tiny \ perl-cgi \ perl-compress-raw-zlib \ - perl-data-dumper \ perl-date-manip \ perl-datetime \ perl-datetime-format-strptime \ @@ -69,7 +68,6 @@ RUN \ perl-html-tree \ perl-http-cookies \ perl-io \ - perl-io-compress \ perl-io-html \ perl-io-socket-ssl \ perl-io-stringy \ @@ -102,7 +100,7 @@ RUN \ perl-xml-writer \ pkgconf \ pngquant \ - python2 \ + python3 \ sdl-dev \ tar \ uriparser-dev \ @@ -171,6 +169,7 @@ RUN \ --disable-avahi \ --disable-dbus_1 \ --disable-bintray_cache \ + --disable-execinfo \ --disable-hdhomerun_static \ --enable-hdhomerun_client \ --enable-libav \ @@ -180,6 +179,7 @@ RUN \ --localstatedir=/var \ --mandir=/usr/share/man \ --prefix=/usr \ + --python=python3 \ --sysconfdir=/config && \ make -j 2 && \ make DESTDIR=/tmp/tvheadend-build install @@ -217,7 +217,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 # set version label ARG BUILD_DATE @@ -256,7 +256,6 @@ RUN \ perl-capture-tiny \ perl-cgi \ perl-compress-raw-zlib \ - perl-data-dumper \ perl-date-manip \ perl-datetime \ perl-datetime-format-strptime \ @@ -273,7 +272,6 @@ RUN \ perl-html-tree \ perl-http-cookies \ perl-io \ - perl-io-compress \ perl-io-html \ perl-io-socket-ssl \ perl-io-stringy \ @@ -305,7 +303,7 @@ RUN \ perl-xml-twig \ perl-xml-writer \ py3-requests \ - python2 \ + python3 \ tar \ uriparser \ wget \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c569145..b3dddf4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,9 +1,9 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as buildstage ############## build stage ############## # package versions ARG ARGTABLE_VER="2.13" -ARG XMLTV_VER="v0.6.3" +ARG XMLTV_VER="v1.0.0" # environment settings ARG TZ="Europe/Oslo" @@ -51,7 +51,6 @@ RUN \ perl-capture-tiny \ perl-cgi \ perl-compress-raw-zlib \ - perl-data-dumper \ perl-date-manip \ perl-datetime \ perl-datetime-format-strptime \ @@ -69,7 +68,6 @@ RUN \ perl-html-tree \ perl-http-cookies \ perl-io \ - perl-io-compress \ perl-io-html \ perl-io-socket-ssl \ perl-io-stringy \ @@ -102,7 +100,7 @@ RUN \ perl-xml-writer \ pkgconf \ pngquant \ - python2 \ + python3 \ sdl-dev \ tar \ uriparser-dev \ @@ -171,6 +169,7 @@ RUN \ --disable-avahi \ --disable-dbus_1 \ --disable-bintray_cache \ + --disable-execinfo \ --disable-hdhomerun_static \ --enable-hdhomerun_client \ --enable-libav \ @@ -179,7 +178,9 @@ RUN \ --infodir=/usr/share/info \ --localstatedir=/var \ --mandir=/usr/share/man \ + --nowerror \ --prefix=/usr \ + --python=python3 \ --sysconfdir=/config && \ make -j 2 && \ make DESTDIR=/tmp/tvheadend-build install @@ -217,7 +218,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 # set version label ARG BUILD_DATE @@ -256,7 +257,6 @@ RUN \ perl-capture-tiny \ perl-cgi \ perl-compress-raw-zlib \ - perl-data-dumper \ perl-date-manip \ perl-datetime \ perl-datetime-format-strptime \ @@ -273,7 +273,6 @@ RUN \ perl-html-tree \ perl-http-cookies \ perl-io \ - perl-io-compress \ perl-io-html \ perl-io-socket-ssl \ perl-io-stringy \ @@ -305,7 +304,7 @@ RUN \ perl-xml-twig \ perl-xml-writer \ py3-requests \ - python2 \ + python3 \ tar \ uriparser \ wget \ diff --git a/README.md b/README.md index 9155247..56acf05 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,6 @@ This image provides various versions that are available via tags. `latest` tag u | :----: | --- | | latest | Current latest release. | | release-4.2 | Latest release from 4.2 branch. | -| stable-4.2.1 | Old stable version. Will not be updated anymore! | -| stable-4.0.9 | Old stable version. Will not be updated anymore! | ## Application Setup @@ -311,6 +309,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.01.22:** - Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv. * **11.05.21:** - Added Intel iHD driver support. * **02.06.20:** - Update to Alpine 3.12. * **27.12.19:** - Add requests and perl-json-xs package. diff --git a/patches/cpanfile b/patches/cpanfile index 02fa44c..349fb96 100644 --- a/patches/cpanfile +++ b/patches/cpanfile @@ -1,6 +1,7 @@ requires 'perl' => '5.24.0'; # perl packages for tvheadend x86 +requires 'Data::Dump' ; requires 'DateTime::Format::ISO8601' ; requires 'DateTime::Format::SQLite' ; requires 'Encode' ; diff --git a/readme-vars.yml b/readme-vars.yml index 20a3aa8..d31ccd9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -23,8 +23,6 @@ development_versions: true development_versions_items: - { tag: "latest", desc: "Current latest release." } - { tag: "release-4.2", desc: "Latest release from 4.2 branch." } - - { tag: "stable-4.2.1", desc: "Old stable version. Will not be updated anymore!" } - - { tag: "stable-4.0.9", desc: "Old stable version. Will not be updated anymore!" } # container parameters common_param_env_vars_enabled: true @@ -126,6 +124,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.01.22:", desc: "Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv." } - { date: "11.05.21:", desc: "Added Intel iHD driver support." } - { date: "02.06.20:", desc: "Update to Alpine 3.12." } - { date: "27.12.19:", desc: "Add requests and perl-json-xs package." }