Fix path to binary

rebasing to alpine 3.12

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: linuxserver
 open_collective: linuxserver

.github/workflows/greetings.yml

@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request_target, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-tvheadend/.github/ISSUE_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-tvheadend/.github/PULL_REQUEST_TEMPLATE.md)!'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 30
+        days-before-close: 365
+        exempt-issue-labels: 'awaiting-approval,work-in-progress'
+        exempt-pr-labels: 'awaiting-approval,work-in-progress'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,227 +1,4 @@
-FROM lsiobase/alpine:3.11 as buildstage
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
-
-# environment settings
-ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
-ENV HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches/
-
-RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache \
-	autoconf \
-	automake \
-	bsd-compat-headers \
-	bzip2 \
-	cmake \
-	curl \
-	ffmpeg-dev \
-	file \
-	findutils \
-	g++ \
-	gcc \
-	gettext-dev \
-	git \
-	gnu-libiconv-dev \
-	gzip \
-	jq \
-	libcurl \
-	libdvbcsa-dev \
-	libgcrypt-dev \
-	libhdhomerun-dev \
-	libtool \
-	libva-dev \
-	libvpx-dev \
-	libxml2-dev \
-	libxslt-dev \
-	linux-headers \
-	make \
-	openssl-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-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	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
-
-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
-
-RUN \
- echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches
-
-RUN \
- echo "**** compile XMLTV ****" && \
- 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 && \
- 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 -j 2 && \
- make test && \
- make DESTDIR=/tmp/xmltv-build install
-
-RUN \
- echo "**** compile tvheadend ****" && \
- if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-	| jq -r '. | .sha'); \
- fi && \
- mkdir -p \
-	/tmp/tvheadend && \
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- git checkout ${TVHEADEND_COMMIT} && \
- ./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 -j 2 && \
- 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 -j 2 && \
- 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 -j 2 && \
- make DESTDIR=/tmp/comskip-build install
-
-############## runtime stage ##############
-FROM lsiobase/alpine:3.11
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
@@ -229,111 +6,174 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
-# environment settings
-ENV HOME="/config"
+# package version
+ARG TVH_VER="master"
+ARG TVHEADEND_COMMIT
 
+# Environment settings
+ENV HOME="/config"
+ARG DEBIAN_FRONTEND="noninteractive"
+
+# add dependencies
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	bsd-compat-headers \
+ apt-get update && \
+ apt-get upgrade -qy && \
+ apt-get install -qy --no-install-recommends \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
 	bzip2 \
-	curl \
-	ffmpeg \
-	ffmpeg-libs \
-	gnu-libiconv \
+	cmake \
+	dvb-apps \
+	gettext \
+	git \
 	gzip \
-	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
-	libhdhomerun-libs \
-	libssl1.1 \
-	libva \
-	libva-intel-driver \
-	mesa-dri-ati \
-	libvpx \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	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-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-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	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 \
-	py3-requests \
+	jq \
+	libavahi-client-dev \
+	libdvbcsa-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	libva-dev \
+	pkg-config \
 	python \
-	tar \
-	uriparser \
+	python3 \
+	python3-requests \
 	wget \
-	x264 \
-	x265 \
-	zlib && \
+	zlib1g-dev && \
+ echo "**** build tvheadend ****" && \
+ mkdir -p \
+	/tmp/patches && \
+ if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
+ fi && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
+ curl -o \
+ /tmp/patches/1348.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
+ curl -o \
+ /tmp/patches/1273.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
+ patch -p1 -i /tmp/patches/1348.patch && \
+ patch -p1 -i /tmp/patches/1273.patch && \
+ ./configure \
+	`#Encoding` \
+	--enable-ffmpeg_static \
+	--disable-libav \
+	\
+	`#Options` \
+	--disable-bintray_cache \
+	--enable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi && \
+ make && \
+ make install && \
+ echo "**** install dependencies for comskip ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev && \
+ echo "**** 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 && \
+ echo "**** remove build dependencies ****" && \
+ apt autoremove && \
+ apt-get purge -qy --allow-remove-essential \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
+	cmake \
+	gettext \
+	git \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev \
+	libavahi-client-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	pkg-config \
+	python \
+	python3 \
+	python3-requests \
+	wget \
+	zlib1g-dev && \
+ echo "**** install runtime dependencies ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-0 \
+	libavahi-client3 \
+	libavahi-common3 \
+	libc6 \
+	libdbus-1-3 \
+	libssl1.0.0 \
+	xmltv \
+	zlib1g && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/* && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
  curl -o \
         /picons.tar.bz2 -L \
         https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
 
-# copy local files and buildstage artifacts
-COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
-COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
-COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-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/ /
 
 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config
+VOLUME /config

Dockerfile.aarch64

@@ -1,225 +1,4 @@
-FROM lsiobase/alpine:arm64v8-3.11 as buildstage
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
-
-# environment settings
-ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
-ENV HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches/
-
-RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache \
-	autoconf \
-	automake \
-	bsd-compat-headers \
-	bzip2 \
-	cmake \
-	curl \
-	ffmpeg-dev \
-	file \
-	findutils \
-	g++ \
-	gcc \
-	gettext-dev \
-	git \
-	gnu-libiconv-dev \
-	gzip \
-	jq \
-	libcurl \
-	libdvbcsa-dev \
-	libgcrypt-dev \
-	libhdhomerun-dev \
-	libtool \
-	libvpx-dev \
-	libxml2-dev \
-	libxslt-dev \
-	linux-headers \
-	make \
-	openssl-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-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	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	
-
-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
-
-RUN \
- echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches
-
-RUN \
- echo "**** compile XMLTV ****" && \
- 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 && \
- 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 -j 2 && \
- make test && \
- make DESTDIR=/tmp/xmltv-build install
-
-RUN \
- echo "**** compile tvheadend ****" && \
- if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
- fi && \
- mkdir -p \
-        /tmp/tvheadend && \
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- git checkout ${TVHEADEND_COMMIT} && \
- ./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 \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/config && \
- make -j 2 && \
- 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 -j 2 && \
- 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 -j 2 && \
- make DESTDIR=/tmp/comskip-build install
-
-############## runtime stage ##############
-FROM lsiobase/alpine:arm64v8-3.11
+FROM lsiobase/ubuntu:arm64v8-bionic
 
 # set version label
 ARG BUILD_DATE
@@ -227,108 +6,174 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
-# environment settings
-ENV HOME="/config"
+# package version
+ARG TVH_VER="master"
+ARG TVHEADEND_COMMIT
 
+# Environment settings
+ENV HOME="/config"
+ARG DEBIAN_FRONTEND="noninteractive"
+
+# add dependencies
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	bsd-compat-headers \
+ apt-get update && \
+ apt-get upgrade -qy && \
+ apt-get install -qy --no-install-recommends \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
 	bzip2 \
-	curl \
-	ffmpeg \
-	ffmpeg-libs \
-	gnu-libiconv \
+	cmake \
+	dvb-apps \
+	gettext \
+	git \
 	gzip \
-	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
-	libhdhomerun-libs \
-	libssl1.1 \
-	libvpx \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	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-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-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	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 \
-	py3-requests \
+	jq \
+	libavahi-client-dev \
+	libdvbcsa-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	libva-dev \
+	pkg-config \
 	python \
-	tar \
-	uriparser \
+	python3 \
+	python3-requests \
 	wget \
-	x264 \
-	x265 \
-	zlib && \
+	zlib1g-dev && \
+ echo "**** build tvheadend ****" && \
+ mkdir -p \
+	/tmp/patches && \
+ if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
+ fi && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
+ curl -o \
+ /tmp/patches/1348.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
+ curl -o \
+ /tmp/patches/1273.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
+ patch -p1 -i /tmp/patches/1348.patch && \
+ patch -p1 -i /tmp/patches/1273.patch && \
+ ./configure \
+	`#Encoding` \
+	--enable-ffmpeg_static \
+	--disable-libav \
+	\
+	`#Options` \
+	--disable-bintray_cache \
+	--enable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi && \
+ make && \
+ make install && \
+ echo "**** install dependencies for comskip ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev && \
+ echo "**** 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 && \
+ echo "**** remove build dependencies ****" && \
+ apt autoremove && \
+ apt-get purge -qy --allow-remove-essential \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
+	cmake \
+	gettext \
+	git \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev \
+	libavahi-client-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	pkg-config \
+	python \
+	python3 \
+	python3-requests \
+	wget \
+	zlib1g-dev && \
+ echo "**** install runtime dependencies ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-0 \
+	libavahi-client3 \
+	libavahi-common3 \
+	libc6 \
+	libdbus-1-3 \
+	libssl1.0.0 \
+	xmltv \
+	zlib1g && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/* && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
  curl -o \
         /picons.tar.bz2 -L \
         https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
 
-# copy local files and buildstage artifacts
-COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
-COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
-COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-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/ /
 
 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config
+VOLUME /config

Dockerfile.armhf

@@ -1,225 +1,4 @@
-FROM lsiobase/alpine:arm32v7-3.11 as buildstage
-############## build stage ##############
-
-# package versions
-ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
-
-# environment settings
-ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
-ENV HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches/
-
-RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache \
-	autoconf \
-	automake \
-	bsd-compat-headers \
-	bzip2 \
-	cmake \
-	curl \
-	ffmpeg-dev \
-	file \
-	findutils \
-	g++ \
-	gcc \
-	gettext-dev \
-	git \
-	gnu-libiconv-dev \
-	gzip \
-	jq \
-	libcurl \
-	libdvbcsa-dev \
-	libgcrypt-dev \
-	libhdhomerun-dev \
-	libtool \
-	libvpx-dev \
-	libxml2-dev \
-	libxslt-dev \
-	linux-headers \
-	make \
-	openssl-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-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	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
-
-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
-
-RUN \
- echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
- cpanm --installdeps /tmp/patches
-
-RUN \
- echo "**** compile XMLTV ****" && \
- 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 && \
- 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 -j 2 && \
- make test && \
- make DESTDIR=/tmp/xmltv-build install
-
-RUN \
- echo "**** compile tvheadend ****" && \
- if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
- fi && \
- mkdir -p \
-        /tmp/tvheadend && \
- git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
- cd /tmp/tvheadend && \
- git checkout ${TVHEADEND_COMMIT} && \
- ./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 \
-	--infodir=/usr/share/info \
-	--localstatedir=/var \
-	--mandir=/usr/share/man \
-	--prefix=/usr \
-	--sysconfdir=/config && \
- make -j 2 && \
- 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 -j 2 && \
- 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 -j 2 && \
- make DESTDIR=/tmp/comskip-build install
-
-############## runtime stage ##############
-FROM lsiobase/alpine:arm32v7-3.11
+FROM lsiobase/ubuntu:arm32v7-bionic
 
 # set version label
 ARG BUILD_DATE
@@ -227,108 +6,174 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
-# environment settings
-ENV HOME="/config"
+# package version
+ARG TVH_VER="master"
+ARG TVHEADEND_COMMIT
 
+# Environment settings
+ENV HOME="/config"
+ARG DEBIAN_FRONTEND="noninteractive"
+
+# add dependencies
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	bsd-compat-headers \
+ apt-get update && \
+ apt-get upgrade -qy && \
+ apt-get install -qy --no-install-recommends \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
 	bzip2 \
-	curl \
-	ffmpeg \
-	ffmpeg-libs \
-	gnu-libiconv \
+	cmake \
+	dvb-apps \
+	gettext \
+	git \
 	gzip \
-	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
-	libhdhomerun-libs \
-	libssl1.1 \
-	libvpx \
-	libxml2 \
-	libxslt \
-	linux-headers \
-	openssl \
-	opus \
-	pcre2 \
-	perl \
-	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-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-json-xs \
-	perl-libwww \
-	perl-lingua-en-numbers-ordinate \
-	perl-lingua-preferred \
-	perl-list-moreutils \
-	perl-lwp-useragent-determined \
-	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 \
-	py3-requests \
+	jq \
+	libavahi-client-dev \
+	libdvbcsa-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	libva-dev \
+	pkg-config \
 	python \
-	tar \
-	uriparser \
+	python3 \
+	python3-requests \
 	wget \
-	x264 \
-	x265 \
-	zlib && \
+	zlib1g-dev && \
+ echo "**** build tvheadend ****" && \
+ mkdir -p \
+	/tmp/patches && \
+ if [ -z ${TVHEADEND_COMMIT+x} ]; then \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
+ fi && \
+ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
+ cd /tmp/tvheadend && \
+ git checkout ${TVHEADEND_COMMIT} && \
+ curl -o \
+ /tmp/patches/1348.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1348.patch" && \
+ curl -o \
+ /tmp/patches/1273.patch -L \
+	"https://patch-diff.githubusercontent.com/raw/tvheadend/tvheadend/pull/1273.patch" && \
+ patch -p1 -i /tmp/patches/1348.patch && \
+ patch -p1 -i /tmp/patches/1273.patch && \
+ ./configure \
+	`#Encoding` \
+	--enable-ffmpeg_static \
+	--disable-libav \
+	\
+	`#Options` \
+	--disable-bintray_cache \
+	--enable-hdhomerun_static \
+	--enable-hdhomerun_client \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi && \
+ make && \
+ make install && \
+ echo "**** install dependencies for comskip ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev && \
+ echo "**** 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 && \
+ echo "**** remove build dependencies ****" && \
+ apt autoremove && \
+ apt-get purge -qy --allow-remove-essential \
+	autoconf \
+	automake \
+	binutils \
+	build-essential \
+	cmake \
+	gettext \
+	git \
+	libargtable2-dev \
+	libavformat-dev \
+	libbz2-dev \
+	libdca-dev \
+	libfaac-dev \
+	libfdk-aac-dev \
+	libmp3lame-dev \
+	libopencore-amrnb-dev \
+	libopencore-amrwb-dev \
+	libopus-dev \
+	libsdl1.2-dev \
+	libsoxr-dev \
+	libspeex-dev \
+	libva-dev \
+	libxvidcore-dev \
+	libvo-aacenc-dev \
+	libvorbisenc2 \
+	libvorbis-dev \
+	libvpx-dev \
+	libx264-dev \
+	libx265-dev \
+	libavahi-client-dev \
+	libhdhomerun-dev \
+	libiconv-hook-dev \
+	libssl-dev \
+	libtool \
+	pkg-config \
+	python \
+	python3 \
+	python3-requests \
+	wget \
+	zlib1g-dev && \
+ echo "**** install runtime dependencies ****" && \
+ apt-get install -qy --no-install-recommends \
+	libargtable2-0 \
+	libavahi-client3 \
+	libavahi-common3 \
+	libc6 \
+	libdbus-1-3 \
+	libssl1.0.0 \
+	xmltv \
+	zlib1g && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/* && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
  curl -o \
         /picons.tar.bz2 -L \
         https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
 
-# copy local files and buildstage artifacts
-COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
-COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
-COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
-COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
-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/ /
 
 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config
+VOLUME /config

Jenkinsfile

@@ -26,8 +26,8 @@ pipeline {
     DOCKERHUB_IMAGE = 'linuxserver/tvheadend'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend'
     PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend'
-    DIST_IMAGE = 'alpine'
-    MULTIARCH='true'
+    DIST_IMAGE = 'ubuntu'
+    MULTIARCH='false'
     CI='true'
     CI_WEB='true'
     CI_PORT='9981'
@@ -44,7 +44,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':j0nny 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -58,7 +58,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -129,16 +129,15 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a j0nny build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
-          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
@@ -153,13 +152,12 @@ pipeline {
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "j0nny"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
@@ -180,7 +178,6 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
@@ -226,7 +223,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -237,7 +234,7 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=j0nny -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -245,9 +242,9 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f j0nny
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
                 cd ${TEMPDIR}/repo/${LS_REPO}/
                 git add ${TEMPLATED_FILES}
@@ -277,7 +274,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -357,7 +354,9 @@ pipeline {
               sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
+                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
               sh '''docker rmi \
                     ${IMAGE}:arm32v7-${META_TAG} \
                     lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -384,7 +383,9 @@ pipeline {
               sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
+                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
               sh '''docker rmi \
                     ${IMAGE}:arm64v8-${META_TAG} \
                     lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -396,7 +397,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -424,7 +425,7 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f j0nny
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -448,7 +449,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -462,7 +463,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "j0nny"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -541,30 +542,27 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
           ]
         ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:j0nny
+                    docker push ${PUSHIMAGE}:j0nny
+                    docker push ${PUSHIMAGE}:${META_TAG}
+                  done
+               '''
+          }
           sh '''#! /bin/bash
-                set -e
-                echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
-                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
-                  docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                  docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
-                  docker push ${PUSHIMAGE}:latest
-                  docker push ${PUSHIMAGE}:${META_TAG}
-                done
-                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:latest || :
+                  ${DELETEIMAGE}:j0nny || :
                 done
              '''
         }
@@ -583,76 +581,69 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
           ]
         ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  if [ "${CI}" == "false" ]; then
+                    docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  fi
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-j0nny
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-j0nny
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-j0nny
+                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-j0nny
+                    docker push ${MANIFESTIMAGE}:arm32v7-j0nny
+                    docker push ${MANIFESTIMAGE}:arm64v8-j0nny
+                    docker manifest push --purge ${MANIFESTIMAGE}:j0nny || :
+                    docker manifest create ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:amd64-j0nny ${MANIFESTIMAGE}:arm32v7-j0nny ${MANIFESTIMAGE}:arm64v8-j0nny
+                    docker manifest annotate ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:arm32v7-j0nny --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:j0nny ${MANIFESTIMAGE}:arm64v8-j0nny --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:j0nny
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
+                  done
+                  docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
+                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
+                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
+                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:j0nny
+                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
+                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-j0nny
+                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-j0nny
+                  docker push ${GITHUBIMAGE}:amd64-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
+                  docker push ${GITHUBIMAGE}:j0nny
+                  docker push ${GITHUBIMAGE}:${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-j0nny
+                  docker push ${GITHUBIMAGE}:arm64v8-j0nny
+               '''
+          }
           sh '''#! /bin/bash
-                set -e
-                echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
-                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                if [ "${CI}" == "false" ]; then
-                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                fi
-                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
-                  docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                  docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                  docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
-                  docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:amd64-latest
-                  docker push ${MANIFESTIMAGE}:arm32v7-latest
-                  docker push ${MANIFESTIMAGE}:arm64v8-latest
-                  docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                  docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
-                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
-                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                  docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
-                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                  docker manifest push --purge ${MANIFESTIMAGE}:latest
-                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                done
-                for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
-                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
-                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
-                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
-                  docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
-                  docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
-                  docker push ${LEGACYIMAGE}:amd64-${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker push ${LEGACYIMAGE}:latest
-                  docker push ${LEGACYIMAGE}:${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-latest
-                  docker push ${LEGACYIMAGE}:arm64v8-latest
-                done
-             '''
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:amd64-j0nny \
                   ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm32v7-j0nny \
                   ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest || :
+                  ${DELETEIMAGE}:arm64v8-j0nny || :
                 done
                 docker rmi \
                 lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
@@ -664,7 +655,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "j0nny"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -676,14 +667,14 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to j0nny",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
               echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "j0nny",\
                      "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                      "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": false}' >> releasebody.json
@@ -707,6 +698,10 @@ pipeline {
           ]
         ]) {
           sh '''#! /bin/bash
+                set -e
+                TEMPDIR=$(mktemp -d)
+                docker pull linuxserver/jenkins-builder:latest
+                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=j0nny -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
                 docker pull lsiodev/readme-sync
                 docker run --rm=true \
                   -e DOCKERHUB_USERNAME=$DOCKERUSER \
@@ -714,7 +709,9 @@ pipeline {
                   -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
                   -e DOCKER_REPOSITORY=${IMAGE} \
                   -e GIT_BRANCH=master \
-                  lsiodev/readme-sync bash -c 'node sync' '''
+                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
+                  lsiodev/readme-sync bash -c 'node sync' 
+                rm -Rf ${TEMPDIR} '''
         }
       }
     }

README.md

@@ -1,13 +1,13 @@
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
-[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![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")
+[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](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 :-
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
  * regular and timely application updates
  * easy user mappings (PGID, PUID)
@@ -25,16 +25,15 @@ Find us at:
 
 # [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)
-[![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)
-[![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)
+[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-tvheadend)
+[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-tvheadend/releases)
+[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-tvheadend/packages)
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-tvheadend/container_registry)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend)
+[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/tvheadend)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-tvheadend%2Fjob%2Fj0nny%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/j0nny/)
+[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Ftvheadend%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html)
 
 [Tvheadend](https://www.tvheadend.org/) works as a proxy server: 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.
@@ -103,7 +102,7 @@ Compatible with docker-compose v2 schemas.
 
 ```
 ---
-version: "2"
+version: "2.1"
 services:
   tvheadend:
     image: linuxserver/tvheadend
@@ -144,7 +143,7 @@ Container images are configured using parameters passed at runtime (such as thos
 
 ## Environment variables from files (Docker secrets)
 
-You can set any environment variable from a file by using a special prepend `FILE__`. 
+You can set any environment variable from a file by using a special prepend `FILE__`.
 
 As an example:
 
@@ -154,6 +153,11 @@ As an example:
 
 Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
 
+## Umask for running applications
+
+For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
+Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
+
 ## 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`.
@@ -222,7 +226,7 @@ For advanced setup of tvheadend, go to [Tvheadend][appurl]
 
 **Picons**
 
-We have added all the picons from [picons.xyz](https://picons.xyz/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
+We have added all the picons from [picons.eu](https://picons.eu/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
 You need to enable minimum advanced view level to see the picons options.
 
 ## Additional runtime parameters
@@ -230,6 +234,11 @@ You need to enable minimum advanced view level to see the picons options.
 In some cases it might be necessary to start tvheadend with additional parameters, for example to enable debugging or specify webroot for reverse proxy. Be sure to have the right parameters set, as adding the wrong once might lead to the container not starting correctly.
 
 
+## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27tvheadend%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=tvheadend "view available mods for this container.")
+
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
+
 
 ## Support Info
 
@@ -295,41 +304,4 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **27.12.19:** - Add requests and perl-json-xs package.
-* **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.
-* **28.06.19:** - Rebasing to alpine 3.10.
-* **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
-* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
-* **01.03.19:** - Bump xmltv to 0.6.1.
-* **28.02.19:** - add perl-lwp-useragent-determined.
-* **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
-* **14.02.19:** - Add picons path to config.
-* **15.01.19:** - Add pipeline logic and multi arch.
-* **12.09.18:** - Rebase to alpine 3.8 and use buildstage type build.
-* **21.04.18:** - Add JSON::XS Perl package for grab_tv_huro.
-* **24.03.18:** - Add dvbcsa package.
-* **04.03.18:** - Use sourceforge master rather than mirror for xmltv.
-* **22.02.18:** - Add lost libva-intel-driver.
-* **21.02.18:** - Fix wrong version of iconv used.
-* **18.02.18:** - Add vaapi support, some cleanup and dropping of deprecated options.
-* **04.01.18:** - Deprecate cpu_core routine lack of scaling.
-* **11.12.17:** - Rebase to alpine 3.7, linting fixes.
-* **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.
+* **24.09.20:** - Initial j0nny Release.

jenkins-vars.yml

@@ -4,8 +4,8 @@
 project_name: docker-tvheadend
 external_type: github_commit
 release_type: stable
-release_tag: latest
-ls_branch: master
+release_tag: j0nny
+ls_branch: j0nny
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'tvheadend'
@@ -17,8 +17,8 @@ repo_vars:
   - DOCKERHUB_IMAGE = 'linuxserver/tvheadend'
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/tvheadend'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/tvheadend'
-  - DIST_IMAGE = 'alpine'
-  - MULTIARCH='true'
+  - DIST_IMAGE = 'ubuntu'
+  - MULTIARCH='false'
   - CI='true'
   - CI_WEB='true'
   - CI_PORT='9981'

package_versions.txt

@@ -1,235 +1,508 @@
-alpine-baselayout-3.2.0-r3
-alpine-keys-2.1-r2
-alsa-lib-1.2.1.2-r0
-apk-tools-2.10.4-r3
-bash-5.0.11-r1
-bsd-compat-headers-0.7.2-r0
-busybox-1.31.1-r9
-bzip2-1.0.8-r1
-ca-certificates-20191127-r1
-ca-certificates-cacert-20191127-r1
-coreutils-8.31-r0
-curl-7.67.0-r0
-elfutils-libelf-0.168-r2
-expat-2.2.9-r1
-ffmpeg-4.2.1-r3
-ffmpeg-libs-4.2.1-r3
-fontconfig-2.13.1-r2
-freetype-2.10.1-r0
-fribidi-1.0.8-r0
-gdbm-1.13-r1
-gmp-6.1.2-r1
-gnu-libiconv-1.15-r2
-gnutls-3.6.10-r0
-gzip-1.10-r0
-lame-3.100-r0
-libacl-2.2.53-r0
-libass-0.14.0-r0
-libattr-2.4.48-r0
-libbsd-0.10.0-r0
-libbz2-1.0.8-r1
-libc-utils-0.7.2-r0
-libcrypto1.1-1.1.1d-r3
-libcurl-7.67.0-r0
-libdrm-2.4.100-r0
-libdvbcsa-1.1.0-r1
-libffi-3.2.1-r6
-libgcc-9.2.0-r3
-libgcrypt-1.8.5-r0
-libgpg-error-1.36-r2
-libhdhomerun-libs-20190621-r0
-libidn-1.35-r0
-libjpeg-turbo-2.0.4-r0
-libogg-1.3.4-r0
-libpciaccess-0.16-r0
-libpng-1.6.37-r1
-libssl1.1-1.1.1d-r3
-libstdc++-9.2.0-r3
-libtasn1-4.15.0-r0
-libtheora-1.1.1-r14
-libtls-standalone-2.9.1-r0
-libunistring-0.9.10-r0
-liburiparser-0.9.3-r0
-libuuid-2.34-r1
-libva-2.6.0-r0
-libva-intel-driver-2.4.0-r0
-libvdpau-1.3-r0
-libvorbis-1.3.6-r2
-libvpx-1.8.1-r0
-libx11-1.6.9-r0
-libxau-1.0.9-r0
-libxcb-1.13.1-r0
-libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxfixes-5.0.3-r2
-libxml2-2.9.10-r2
-libxshmfence-1.3-r0
-libxslt-1.1.34-r0
-linux-headers-4.19.36-r0
-linux-pam-1.3.1-r1
-llvm9-libs-9.0.0-r1
-mesa-19.2.7-r0
-mesa-dri-ati-19.2.7-r0
-mesa-glapi-19.2.7-r0
-musl-1.1.24-r0
-musl-utils-1.1.24-r0
-ncurses-libs-6.1_p20200118-r2
-ncurses-terminfo-base-6.1_p20200118-r2
-nettle-3.5.1-r0
-nghttp2-libs-1.40.0-r0
-openssl-1.1.1d-r3
-opus-1.3.1-r0
-p11-kit-0.23.18.1-r0
-pcre2-10.34-r1
-perl-5.30.1-r0
-perl-archive-zip-1.67-r0
-perl-b-hooks-endofscope-0.24-r0
-perl-boolean-0.46-r0
-perl-canary-stability-2013-r0
-perl-capture-tiny-0.48-r0
-perl-cgi-4.44-r0
-perl-class-data-inheritable-0.08-r0
-perl-class-inspector-1.36-r0
-perl-class-methodmaker-2.24-r4
-perl-class-singleton-1.5-r0
-perl-common-sense-3.74-r1
-perl-compress-raw-bzip2-2.093-r0
-perl-compress-raw-zlib-2.093-r0
-perl-cpan-meta-check-0.014-r0
-perl-data-dumper-2.173-r3
-perl-date-manip-6.79-r0
-perl-datetime-1.51-r1
-perl-datetime-format-strptime-1.76-r0
-perl-datetime-locale-1.25-r0
-perl-datetime-timezone-2.38-r0
-perl-dbd-sqlite-1.64-r1
-perl-dbi-1.642-r2
-perl-devel-stacktrace-2.04-r0
-perl-devel-symdump-2.18-r0
-perl-digest-sha1-2.13-r11
-perl-dist-checkconflicts-0.11-r0
-perl-doc-5.30.1-r0
-perl-encode-locale-1.05-r1
-perl-eval-closure-0.14-r0
-perl-exception-class-1.44-r0
-perl-exporter-tiny-1.002001-r0
-perl-file-listing-6.04-r1
-perl-file-sharedir-1.116-r0
-perl-file-sharedir-install-0.13-r0
-perl-file-slurp-9999.29-r0
-perl-file-temp-0.2309-r0
-perl-file-which-1.23-r0
-perl-getopt-long-2.51-r0
-perl-html-parser-3.72-r4
-perl-html-tagset-3.20-r1
-perl-html-tree-5.07-r0
-perl-http-cookies-6.08-r0
-perl-http-daemon-6.06-r0
-perl-http-date-6.05-r0
-perl-http-message-6.18-r0
-perl-http-negotiate-6.01-r1
-perl-importer-0.025-r0
-perl-io-1.39-r0
-perl-io-compress-2.093-r0
-perl-io-html-1.001-r2
-perl-io-socket-ssl-2.066-r0
-perl-io-stringy-2.112-r0
-perl-ipc-run3-0.048-r1
-perl-json-4.02-r0
-perl-json-xs-4.02-r1
-perl-libwww-6.43-r0
-perl-lingua-en-numbers-ordinate-1.04-r1
-perl-lingua-preferred-0.2.4-r1
-perl-list-moreutils-0.428-r0
-perl-list-moreutils-xs-0.428-r2
-perl-lwp-mediatypes-6.04-r0
-perl-lwp-useragent-determined-1.07-r0
-perl-module-build-0.4229-r0
-perl-module-implementation-0.09-r1
-perl-module-metadata-1.000037-r0
-perl-module-pluggable-5.2-r0
-perl-module-runtime-0.016-r2
-perl-mro-compat-0.13-r0
-perl-namespace-autoclean-0.29-r0
-perl-namespace-clean-0.27-r0
-perl-net-http-6.19-r0
-perl-net-libidn-0.12-r7
-perl-net-ssleay-1.88-r0
-perl-package-deprecationmanager-0.17-r0
-perl-package-stash-0.38-r1
-perl-package-stash-xs-0.29-r2
-perl-params-util-1.07-r7
-perl-params-validate-1.29-r2
-perl-params-validationcompiler-0.30-r0
-perl-parse-recdescent-1.967015-r1
-perl-path-class-0.37-r0
-perl-pod-coverage-0.23-r0
-perl-role-tiny-2.001004-r0
-perl-scalar-list-utils-1.53-r1
-perl-scope-guard-0.21-r0
-perl-specio-0.45-r0
-perl-sub-exporter-progressive-0.001013-r0
-perl-sub-identify-0.14-r3
-perl-sub-info-0.002-r0
-perl-sub-install-0.928-r0
-perl-sub-name-0.26-r0
-perl-sub-quote-2.006006-r0
-perl-sub-uplevel-0.2800-r0
-perl-term-progressbar-2.22-r0
-perl-term-readkey-2.38-r2
-perl-term-table-0.015-r0
-perl-test-exception-0.43-r0
-perl-test-fatal-0.014-r1
-perl-test-needs-0.002006-r0
-perl-test-pod-1.52-r0
-perl-test-requires-0.10-r0
-perl-test-simple-1.302170-r0
-perl-test-taint-1.08-r1
-perl-test-warnings-0.027-r0
-perl-test-without-module-0.20-r0
-perl-test2-plugin-nowarnings-0.08-r0
-perl-test2-suite-0.000127-r0
-perl-timedate-2.30-r1
-perl-try-tiny-0.30-r1
-perl-types-serialiser-1.0-r1
-perl-unicode-string-2.10-r1
-perl-uri-1.76-r0
-perl-variable-magic-0.62-r2
-perl-www-robotrules-6.02-r1
-perl-xml-libxml-2.0134-r3
-perl-xml-libxslt-1.96-r2
-perl-xml-namespacesupport-1.12-r0
-perl-xml-parser-2.46-r0
-perl-xml-sax-1.02-r0
-perl-xml-sax-base-1.09-r0
-perl-xml-treepp-0.43-r1
-perl-xml-twig-3.52-r1
-perl-xml-writer-0.625-r2
-perl-yaml-syck-1.31-r2
-py3-certifi-2019.9.11-r2
-py3-chardet-3.0.4-r3
-py3-idna-2.8-r3
-py3-requests-2.22.0-r0
-py3-urllib3-1.25.7-r1
-python2-2.7.16-r3
-python3-3.8.1-r0
-readline-8.0.1-r0
-scanelf-1.2.4-r0
-sdl2-2.0.10-r0
-shadow-4.7-r1
-sqlite-libs-3.30.1-r1
-ssl_client-1.31.1-r9
-tar-1.32-r1
-tzdata-2019c-r0
-uriparser-0.9.3-r0
-v4l-utils-libs-1.18.0-r0
-wayland-libs-client-1.17.0-r0
-wget-1.20.3-r0
-x264-20191119-r0
-x264-libs-20191119-r0
-x265-3.2.1-r0
-x265-libs-3.2.1-r0
-xvidcore-1.3.5-r0
-xz-5.2.4-r0
-xz-libs-5.2.4-r0
-zlib-1.2.11-r3
+adduser3.116ubuntu1
+apt1.6.12ubuntu0.1
+apt-utils1.6.12ubuntu0.1
+autotools-dev20180224.1
+base-files10.1ubuntu2.10
+base-passwd3.5.44
+bash4.4.18-2ubuntu1.2
+binutils-common2.30-21ubuntu1~18.04.4
+binutils-x86-64-linux-gnu2.30-21ubuntu1~18.04.4
+bsdutils1:2.31.1-0.4ubuntu3.7
+bzip21.0.6-8.1ubuntu0.2
+ca-certificates20190110~18.04.1
+cmake-data3.10.2-1ubuntu2.18.04.1
+coreutils8.28-1ubuntu1
+cpp4:7.4.0-1ubuntu2.3
+cpp-77.5.0-3ubuntu1~18.04
+curl7.58.0-2ubuntu3.10
+dash0.5.8-2.10
+debconf1.5.66ubuntu1
+debianutils4.8.4
+diffutils1:3.6-1
+dpkg1.19.0.5ubuntu2.3
+dtv-scan-tables0+git20171226.07b18ec-1
+dvb-apps1.1.1+rev1500-1.2
+e2fsprogs1.44.1-1ubuntu1.3
+fdisk2.31.1-0.4ubuntu3.7
+file1:5.32-2ubuntu0.4
+findutils4.6.0+git+20170828-2
+fontconfig2.12.6-0ubuntu2
+fontconfig-config2.12.6-0ubuntu2
+fonts-dejavu-core2.37-1
+gcc-7-base7.5.0-3ubuntu1~18.04
+gcc-8-base8.4.0-1ubuntu1~18.04
+gettext-base0.19.8.1-6ubuntu0.3
+git-man1:2.17.1-1ubuntu0.7
+gpgv2.2.4-1ubuntu1.3
+grep3.1-2build1
+gzip1.6-5ubuntu1
+hostname3.20
+init-system-helpers1.51
+jq1.5+dfsg-2
+krb5-locales1.16-2ubuntu0.1
+libacl12.2.52-3build1
+libalgorithm-c3-perl0.10-1
+libapt-inst2.01.6.12ubuntu0.1
+libapt-pkg5.01.6.12ubuntu0.1
+libarchive133.2.2-3.1ubuntu0.6
+libarchive-zip-perl1.60-1ubuntu0.1
+libargtable2-013-1
+libargtable2-docs13-1
+libasan47.5.0-3ubuntu1~18.04
+libasn1-8-heimdal7.5.0+dfsg-1
+libasound21.1.3-5ubuntu0.5
+libasound2-data1.1.3-5ubuntu0.5
+libasound2-dev1.1.3-5ubuntu0.5
+libasyncns00.8-6
+libatomic18.4.0-1ubuntu1~18.04
+libattr11:2.4.47-2build1
+libaudit11:2.8.2-1ubuntu1
+libaudit-common1:2.8.2-1ubuntu1
+libavahi-client30.7-3.1ubuntu1.2
+libavahi-common30.7-3.1ubuntu1.2
+libavahi-common-data0.7-3.1ubuntu1.2
+libavahi-common-dev0.7-3.1ubuntu1.2
+libavutil557:3.4.8-0ubuntu0.2
+libavutil-dev7:3.4.8-0ubuntu0.2
+libb-hooks-endofscope-perl0.21-1
+libb-hooks-op-check-perl0.22-1
+libbinutils2.30-21ubuntu1~18.04.4
+libblkid12.31.1-0.4ubuntu3.7
+libbluray21:1.0.2-3
+libbsd00.8.7-1ubuntu0.1
+libbz2-1.01.0.6-8.1ubuntu0.2
+libc62.27-3ubuntu1.2
+libc6-dev2.27-3ubuntu1.2
+libcaca00.99.beta19-2ubuntu0.18.04.1
+libcairo21.15.10-2ubuntu0.1
+libcap-ng00.7.7-3.1
+libc-bin2.27-3ubuntu1.2
+libcc1-08.4.0-1ubuntu1~18.04
+libc-dev-bin2.27-3ubuntu1.2
+libcgi-pm-perl4.38-1
+libcilkrts57.5.0-3ubuntu1~18.04
+libclass-c3-perl0.33-1
+libclass-data-inheritable-perl0.08-2
+libclass-factory-util-perl1.7-3
+libclass-inspector-perl1.32-1
+libclass-method-modifiers-perl2.12-1
+libclass-singleton-perl1.5-1
+libcom-err21.44.1-1ubuntu1.3
+libconvert-binhex-perl1.125-1
+libcroco30.6.12-2
+libcrystalhd31:0.0~git20110715.fdd2f19-12
+libcurl3-gnutls7.58.0-2ubuntu3.10
+libcurl47.58.0-2ubuntu3.10
+libdata-dump-perl1.23-1
+libdata-optlist-perl0.110-1
+libdate-manip-perl6.60-1
+libdatetime-format-builder-perl0.8100-1
+libdatetime-format-iso8601-perl0.08-2
+libdatetime-format-sqlite-perl0.11-2
+libdatetime-format-strptime-perl1.7500-1
+libdatetime-locale-perl1:1.17-1
+libdatetime-perl2:1.46-1
+libdatetime-timezone-perl1:2.18-1+2018d
+libdatrie10.2.10-7
+libdb5.35.3.28-13.1ubuntu1.1
+libdbd-sqlite3-perl1.56-1
+libdbi-perl1.640-1ubuntu0.2
+libdbus-1-31.12.2-1ubuntu1.2
+libdca00.0.5-10
+libdebconfclient00.213ubuntu1
+libdevel-callchecker-perl0.007-2build1
+libdevel-stacktrace-perl2.0300-1
+libdpkg-perl1.19.0.5ubuntu2.3
+libdrm22.4.101-2~18.04.1
+libdrm-amdgpu12.4.101-2~18.04.1
+libdrm-common2.4.101-2~18.04.1
+libdrm-dev2.4.101-2~18.04.1
+libdrm-intel12.4.101-2~18.04.1
+libdrm-nouveau22.4.101-2~18.04.1
+libdrm-radeon12.4.101-2~18.04.1
+libdvbcsa11.1.0-2
+libdvbcsa-dev1.1.0-2
+libdynaloader-functions-perl0.003-1
+libedit23.1-20170329-1
+libegl11.0.0-2ubuntu2.3
+libegl-mesa020.0.8-0ubuntu1~18.04.1
+libelf10.170-0.4ubuntu0.1
+libencode-locale-perl1.05-1
+liberror-perl0.17025-1
+libeval-closure-perl0.14-1
+libexception-class-perl1.44-1
+libexpat12.2.5-3ubuntu0.2
+libexporter-tiny-perl1.000000-2
+libext2fs21.44.1-1ubuntu1.3
+libfaac01.29.7.7-1
+libfcgi-perl0.78-2build1
+libfdisk12.31.1-0.4ubuntu3.7
+libfdk-aac10.1.5-1
+libffi63.2.1-8
+libfile-chdir-perl0.1008-1
+libfile-homedir-perl1.002-1
+libfile-listing-perl6.04-1
+libfile-sharedir-perl1.104-1
+libfile-slurp-perl9999.19-6
+libfile-which-perl1.21-1
+libflac81.3.2-1
+libfontconfig12.12.6-0ubuntu2
+libfreetype62.8.1-2ubuntu2
+libfribidi00.19.7-2
+libgbm120.0.8-0ubuntu1~18.04.1
+libgcc11:8.4.0-1ubuntu1~18.04
+libgcc-7-dev7.5.0-3ubuntu1~18.04
+libgcrypt201.8.1-4ubuntu1.2
+libgdbm51.14.1-6
+libgdbm-compat41.14.1-6
+libgdk-pixbuf2.0-02.36.11-2
+libgdk-pixbuf2.0-common2.36.11-2
+libgl11.0.0-2ubuntu2.3
+libgl1-mesa-dev20.0.8-0ubuntu1~18.04.1
+libgl1-mesa-dri20.0.8-0ubuntu1~18.04.1
+libglapi-mesa20.0.8-0ubuntu1~18.04.1
+libgles11.0.0-2ubuntu2.3
+libgles21.0.0-2ubuntu2.3
+libglib2.0-02.56.4-0ubuntu0.18.04.6
+libglib2.0-bin2.56.4-0ubuntu0.18.04.6
+libglib2.0-data2.56.4-0ubuntu0.18.04.6
+libglu1-mesa9.0.0-2.1build1
+libglu1-mesa-dev9.0.0-2.1build1
+libglvnd01.0.0-2ubuntu2.3
+libglvnd-core-dev1.0.0-2ubuntu2.3
+libglvnd-dev1.0.0-2ubuntu2.3
+libglx01.0.0-2ubuntu2.3
+libglx-mesa020.0.8-0ubuntu1~18.04.1
+libgme00.6.2-1
+libgmp102:6.1.2+dfsg-2
+libgnutls303.5.18-1ubuntu1.4
+libgomp18.4.0-1ubuntu1~18.04
+libgpg-error01.27-6
+libgraphite2-31.3.11-2
+libgsm11.0.13-4build1
+libgssapi3-heimdal7.5.0+dfsg-1
+libgssapi-krb5-21.16-2ubuntu0.1
+libharfbuzz0b1.7.2-1ubuntu1
+libhcrypto4-heimdal7.5.0+dfsg-1
+libhdhomerun420180327-1
+libheimbase1-heimdal7.5.0+dfsg-1
+libheimntlm0-heimdal7.5.0+dfsg-1
+libhogweed43.4-1
+libhtml-form-perl6.03-1
+libhtml-parser-perl3.72-3build1
+libhtml-tableextract-perl2.15-1
+libhtml-tagset-perl3.20-3
+libhtml-tree-perl5.07-1
+libhttp-cache-transparent-perl1.1-1
+libhttp-cookies-perl6.04-1
+libhttp-daemon-perl6.01-1
+libhttp-date-perl6.02-1
+libhttp-message-perl6.14-1
+libhttp-negotiate-perl6.00-2
+libhttp-server-simple-perl0.52-1
+libhx509-5-heimdal7.5.0+dfsg-1
+libiconv-hook10.0.20021209-11
+libicu6060.2-3ubuntu3.1
+libidn2-02.0.4-1.1ubuntu0.2
+libio-html-perl1.001-1
+libio-sessiondata-perl1.03-1
+libio-socket-ssl-perl2.060-3~ubuntu18.04.1
+libio-stringy-perl2.111-2
+libisl190.19-1
+libitm18.4.0-1ubuntu1~18.04
+libjbig02.1-3.1build1
+libjpeg88c-2ubuntu8
+libjpeg-turbo81.5.2-0ubuntu5.18.04.4
+libjq11.5+dfsg-2
+libjsoncpp11.7.4-3
+libjson-perl2.97001-1
+libk5crypto31.16-2ubuntu0.1
+libkeyutils11.5.9-9.2ubuntu2
+libkrb5-26-heimdal7.5.0+dfsg-1
+libkrb5-31.16-2ubuntu0.1
+libkrb5support01.16-2ubuntu0.1
+libldap-2.4-22.4.45+dfsg-1ubuntu1.6
+libldap-common2.4.45+dfsg-1ubuntu1.6
+liblist-moreutils-perl0.416-1build3
+libllvm101:10.0.0-4ubuntu1~18.04.2
+liblsan08.4.0-1ubuntu1~18.04
+liblwp-mediatypes-perl6.02-1
+liblwp-protocol-https-perl6.07-2
+liblwp-useragent-determined-perl1.07-1
+liblz4-10.0~r131-2ubuntu3
+liblzma55.2.2-1.3
+liblzo2-22.08-1.2
+libmagic11:5.32-2ubuntu0.4
+libmagic-mgc1:5.32-2ubuntu0.4
+libmailtools-perl2.18-1
+libmime-tools-perl5.509-1
+libmodule-implementation-perl0.09-1
+libmodule-runtime-perl0.016-1
+libmount12.31.1-0.4ubuntu3.7
+libmp3lame03.100-2
+libmpc31.1.0-1
+libmpdec22.4.2-1ubuntu1
+libmpfr64.0.1-1
+libmpg123-01.25.10-1
+libmpx28.4.0-1ubuntu1~18.04
+libmro-compat-perl0.13-1
+libnamespace-autoclean-perl0.28-1
+libnamespace-clean-perl0.27-1
+libncurses56.1-1ubuntu1.18.04
+libncursesw56.1-1ubuntu1.18.04
+libnet-http-perl6.17-1
+libnet-smtp-ssl-perl1.04-1
+libnet-ssleay-perl1.84-1ubuntu0.2
+libnettle63.4-1
+libnghttp2-141.30.0-1ubuntu1
+libnuma12.0.11-2.1ubuntu0.1
+libogg01.3.2-1
+libogg-dev1.3.2-1
+libonig46.7.0-1
+libopencore-amrnb00.1.3-2.1
+libopencore-amrwb00.1.3-2.1
+libopengl01.0.0-2ubuntu2.3
+libopenjp2-72.3.0-2build0.18.04.1
+libopenmpt00.3.6-1
+libopus01.1.2-1ubuntu1
+libossp-uuid161.6.2-1.5build4
+libossp-uuid-perl1.6.2-1.5build4
+libp11-kit00.23.9-2
+libpackage-deprecationmanager-perl0.17-1
+libpackage-stash-perl0.37-1
+libpam0g1.1.8-3.6ubuntu2.18.04.2
+libpam-modules1.1.8-3.6ubuntu2.18.04.2
+libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
+libpam-runtime1.1.8-3.6ubuntu2.18.04.2
+libpango-1.0-01.40.14-1ubuntu0.1
+libpangocairo-1.0-01.40.14-1ubuntu0.1
+libpangoft2-1.0-01.40.14-1ubuntu0.1
+libparams-classify-perl0.015-1
+libparams-util-perl1.07-3build3
+libparams-validate-perl1.29-1
+libparams-validationcompiler-perl0.26-1
+libparse-recdescent-perl1.967015+dfsg-2
+libpciaccess00.14-1
+libpcre16-32:8.39-9
+libpcre32-32:8.39-9
+libpcre32:8.39-9
+libpcre3-dev2:8.39-9
+libpcrecpp0v52:8.39-9
+libperl5.265.26.1-6ubuntu0.3
+libpixman-1-00.34.0-2
+libpng16-161.6.34-1ubuntu0.18.04.2
+libprocps62:3.3.12-3ubuntu1.2
+libpsl50.19.1-5build1
+libpthread-stubs0-dev0.3-4
+libpython2.7-minimal2.7.17-1~18.04ubuntu1.1
+libpython2.7-stdlib2.7.17-1~18.04ubuntu1.1
+libpython3.6-minimal3.6.9-1~18.04ubuntu1.1
+libpython3.6-stdlib3.6.9-1~18.04ubuntu1.1
+libpython3-stdlib3.6.7-1~18.04
+libpython-stdlib2.7.15~rc1-1
+libquadmath08.4.0-1ubuntu1~18.04
+libreadline77.0-3
+librhash01.3.6-2
+libroken18-heimdal7.5.0+dfsg-1
+librole-tiny-perl2.000006-1
+librsvg2-22.40.20-2ubuntu0.2
+librtmp12.4+20151223.gitfa8646d.1-1
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libseccomp22.4.3-1ubuntu3.18.04.3
+libselinux12.7-2build2
+libsemanage12.7-2build2
+libsemanage-common2.7-2build2
+libsensors41:3.4.0-4
+libsepol12.7-1
+libset-scalar-perl1.29-2
+libshine33.1.1-1
+libsigsegv22.12-1
+libslang22.3.1a-3ubuntu1
+libsmartcols12.31.1-0.4ubuntu3.7
+libsnappy1v51.1.7-1
+libsoap-lite-perl1.26-1
+libsoxr00.1.2-3
+libsoxr-lsr00.1.2-3
+libspecio-perl0.42-1
+libspeex11.2~rc1.2-1ubuntu2
+libsqlite3-03.22.0-1ubuntu0.4
+libss21.44.1-1ubuntu1.3
+libssh-gcrypt-40.8.0~20170825.94fa1e38-1ubuntu0.7
+libssl1.0.01.0.2n-1ubuntu5.4
+libssl1.11.1.1-1ubuntu2.1~18.04.6
+libstdc++68.4.0-1ubuntu1~18.04
+libstdc++-7-dev7.5.0-3ubuntu1~18.04
+libsub-exporter-perl0.987-1
+libsub-exporter-progressive-perl0.001013-1
+libsub-identify-perl0.14-1
+libsub-install-perl0.928-1
+libsub-name-perl0.21-1build1
+libsub-quote-perl2.005000-1
+libswresample27:3.4.8-0ubuntu0.2
+libswresample-dev7:3.4.8-0ubuntu0.2
+libsystemd0237-3ubuntu10.42
+libtask-weaken-perl1.05-1
+libtasn1-64.13-2
+libterm-readkey-perl2.37-1build1
+libtext-bidi-perl2.12-1build1
+libtext-iconv-perl1.7-5build6
+libthai00.1.27-2
+libthai-data0.1.27-2
+libtheora01.1.1+dfsg.1-14
+libtiff54.0.9-5ubuntu0.3
+libtimedate-perl2.3000-2
+libtinfo56.1-1ubuntu1.18.04
+libtk-tablematrix-perl1.23-6.1build4
+libtry-tiny-perl0.30-1
+libtsan08.4.0-1ubuntu1~18.04
+libtwolame00.3.13-3
+libubsan07.5.0-3ubuntu1~18.04
+libudev1237-3ubuntu10.42
+libunistring20.9.9-0ubuntu2
+liburi-perl1.73-1
+libuuid12.31.1-0.4ubuntu3.7
+libuv11.18.0-3
+libva22.1.0-3
+libva-drm22.1.0-3
+libva-glx22.1.0-3
+libvariable-magic-perl0.62-1
+libva-wayland22.1.0-3
+libva-x11-22.1.0-3
+libvdpau11.1.1-3ubuntu1
+libvo-aacenc00.1.3-1
+libvorbis0a1.3.5-4.2
+libvorbisfile31.3.5-4.2
+libvpx51.7.0-3ubuntu0.18.04.1
+libwavpack15.1.0-2ubuntu1.4
+libwayland-bin1.16.0-1ubuntu1.1~18.04.3
+libwayland-client01.16.0-1ubuntu1.1~18.04.3
+libwayland-cursor01.16.0-1ubuntu1.1~18.04.3
+libwayland-dev1.16.0-1ubuntu1.1~18.04.3
+libwayland-egl11.16.0-1ubuntu1.1~18.04.3
+libwayland-server01.16.0-1ubuntu1.1~18.04.3
+libwebp60.6.1-2
+libwebpmux30.6.1-2
+libwind0-heimdal7.5.0+dfsg-1
+libwrap07.6.q-27
+libwww-mechanize-perl1.86-1
+libwww-perl6.31-1ubuntu0.1
+libwww-robotrules-perl6.01-1
+libx11-62:1.6.4-3ubuntu0.3
+libx11-data2:1.6.4-3ubuntu0.3
+libx11-dev2:1.6.4-3ubuntu0.3
+libx11-xcb12:1.6.4-3ubuntu0.3
+libx11-xcb-dev2:1.6.4-3ubuntu0.3
+libx264-1522:0.152.2854+gite9a5903-2
+libx265-1462.6-3
+libxau61:1.0.8-1ubuntu1
+libxau-dev1:1.0.8-1ubuntu1
+libxcb11.13-2~ubuntu18.04
+libxcb1-dev1.13-2~ubuntu18.04
+libxcb-dri2-01.13-2~ubuntu18.04
+libxcb-dri2-0-dev1.13-2~ubuntu18.04
+libxcb-dri3-01.13-2~ubuntu18.04
+libxcb-dri3-dev1.13-2~ubuntu18.04
+libxcb-glx01.13-2~ubuntu18.04
+libxcb-glx0-dev1.13-2~ubuntu18.04
+libxcb-present01.13-2~ubuntu18.04
+libxcb-present-dev1.13-2~ubuntu18.04
+libxcb-randr01.13-2~ubuntu18.04
+libxcb-randr0-dev1.13-2~ubuntu18.04
+libxcb-render01.13-2~ubuntu18.04
+libxcb-render0-dev1.13-2~ubuntu18.04
+libxcb-shape01.13-2~ubuntu18.04
+libxcb-shape0-dev1.13-2~ubuntu18.04
+libxcb-shm01.13-2~ubuntu18.04
+libxcb-sync11.13-2~ubuntu18.04
+libxcb-sync-dev1.13-2~ubuntu18.04
+libxcb-xfixes01.13-2~ubuntu18.04
+libxcb-xfixes0-dev1.13-2~ubuntu18.04
+libxdamage11:1.1.4-3
+libxdamage-dev1:1.1.4-3
+libxdmcp61:1.1.2-3
+libxdmcp-dev1:1.1.2-3
+libxext62:1.3.3-1
+libxext-dev2:1.3.3-1
+libxfixes31:5.0.3-1
+libxfixes-dev1:5.0.3-1
+libxft22.3.2-1
+libxml22.9.4+dfsg1-6.1ubuntu1.3
+libxml-dom-perl1.44-2
+libxml-libxml-perl2.0128+dfsg-5
+libxml-libxslt-perl1.95-1build2
+libxml-namespacesupport-perl1.12-1
+libxml-parser-perl2.44-2build3
+libxml-perl0.08-2
+libxml-regexp-perl0.04-1
+libxml-sax-base-perl1.09-1
+libxml-sax-perl0.99+dfsg-2ubuntu1
+libxml-treepp-perl0.43-1
+libxmltv-perl0.5.70-1
+libxml-twig-perl1:3.50-1
+libxml-writer-perl0.625-1
+libxrender11:0.9.10-1
+libxshmfence11.3-1
+libxshmfence-dev1.3-1
+libxslt1.11.1.29-5ubuntu0.2
+libxvidcore42:1.3.5-1
+libxxf86vm11:1.1.4-1
+libxxf86vm-dev1:1.1.4-1
+libzstd11.3.3+dfsg-2ubuntu1.1
+libzvbi00.2.35-13
+libzvbi-common0.2.35-13
+linux-libc-dev4.15.0-118.119
+locales2.27-3ubuntu1.2
+login1:4.5-1ubuntu2
+lsb-base9.20170808ubuntu1
+m41.4.18-1
+make4.1-9.1ubuntu1
+makedev2.3.1-93ubuntu2
+mawk1.3.3-17ubuntu3
+mesa-common-dev20.0.8-0ubuntu1~18.04.1
+mime-support3.60ubuntu1
+mount2.31.1-0.4ubuntu3.7
+multiarch-support2.27-3ubuntu1.2
+ncurses-base6.1-1ubuntu1.18.04
+ncurses-bin6.1-1ubuntu1.18.04
+netbase5.4
+openssl1.1.1-1ubuntu2.1~18.04.6
+passwd1:4.5-1ubuntu2
+patch2.7.6-2ubuntu1.1
+perl5.26.1-6ubuntu0.3
+perl-base5.26.1-6ubuntu0.3
+perl-modules-5.265.26.1-6ubuntu0.3
+perl-openssl-defaults3build1
+perl-tk1:804.033-2build1
+procps2:3.3.12-3ubuntu1.2
+publicsuffix20180223.1310-1
+python2.72.7.17-1~18.04ubuntu1.1
+python2.7-minimal2.7.17-1~18.04ubuntu1.1
+python3.63.6.9-1~18.04ubuntu1.1
+python3.6-minimal3.6.9-1~18.04ubuntu1.1
+python3-minimal3.6.7-1~18.04
+python-minimal2.7.15~rc1-1
+readline-common7.0-3
+sed4.4-2
+sensible-utils0.0.12
+shared-mime-info1.9-2
+sysvinit-utils2.88dsf-59.10ubuntu1
+tar1.29b-2ubuntu0.1
+tzdata2020a-0ubuntu0.18.04
+ubuntu-keyring2018.09.18.1~18.04.0
+ucf3.0038
+util-linux2.31.1-0.4ubuntu3.7
+x11proto-core-dev2018.4-4
+x11proto-damage-dev1:2018.4-4
+x11proto-dev2018.4-4
+x11proto-fixes-dev1:2018.4-4
+x11proto-xext-dev2018.4-4
+x11proto-xf86vidmode-dev2018.4-4
+xmltv0.5.70-1
+xmltv-gui0.5.70-1
+xmltv-util0.5.70-1
+xorg-sgml-doctools1:1.11-1
+xtrans-dev1.3.5-1
+xz-utils5.2.2-1.3
+zlib1g1:1.2.11.dfsg-0ubuntu2

readme-vars.yml

@@ -117,7 +117,7 @@ app_setup_block: |
 
   **Picons**
 
-  We have added all the picons from [picons.xyz](https://picons.xyz/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
+  We have added all the picons from [picons.eu](https://picons.eu/) in the folder /picons. To enable the use of these picons, add the path to the Channel icon path in Configuration --> General --> Base.
   You need to enable minimum advanced view level to see the picons options.
 
   ## Additional runtime parameters
@@ -126,41 +126,4 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "27.12.19:", desc: "Add requests and perl-json-xs package." }
-  - { 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." }
-  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
-  - { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - { date: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
-  - { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }
-  - { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }
-  - { date: "14.02.19:", desc: "Add picons path to config." }
-  - { date: "15.01.19:", desc: "Add pipeline logic and multi arch." }
-  - { date: "12.09.18:", desc: "Rebase to alpine 3.8 and use buildstage type build." }
-  - { date: "21.04.18:", desc: "Add JSON::XS Perl package for grab_tv_huro." }
-  - { date: "24.03.18:", desc: "Add dvbcsa package." }
-  - { date: "04.03.18:", desc: "Use sourceforge master rather than mirror for xmltv." }
-  - { date: "22.02.18:", desc: "Add lost libva-intel-driver." }
-  - { date: "21.02.18:", desc: "Fix wrong version of iconv used." }
-  - { date: "18.02.18:", desc: "Add vaapi support, some cleanup and dropping of deprecated options." }
-  - { date: "04.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
-  - { date: "11.12.17:", desc: "Rebase to alpine 3.7, linting fixes." }
-  - { date: "02.09.17:", desc: "Add codec dependencies." }
-  - { date: "13.07.17:", desc: "Increase uniformity across all archs." }
-  - { date: "08.07.17:", desc: "Update README with full path for comskip." }
-  - { date: "02.07.17:", desc: "Move to one branch for all 4.2 releases." }
-  - { date: "27.05.17:", desc: "Rebase to alpine 3.6." }
-  - { date: "01.05.17:", desc: "Update to tvheadend 4.2.1 stable." }
-  - { date: "18.04.17:", desc: "Use repo version of gnu-libiconv rather than compiling." }
-  - { date: "09.04.17:", desc: "Chain cpanm installs in one block and use --installdeps." }
-  - { date: "09.02.17:", desc: "Perl changes, add picons file to gitignore and update XMLTV to 0.5.69." }
-  - { date: "07.02.17:", desc: "Add variable to add additional runtime paramters." }
-  - { date: "05.02.17:", desc: "Update to alpine 3.5 and change dvb-apps to only compile needed libs." }
-  - { date: "14.11.16:", desc: "Add picons from picons.xyz to /picons folder and add info to README." }
-  - { date: "22.09.16:", desc: "Fix broken tv_grab_wg, libs for xmltv and update README." }
-  - { date: "18.09.16:", desc: "Update XMLTV to 0.5.68 and update README." }
-  - { date: "10.09.16:", desc: "Add layer badges to README." }
-  - { date: "05.09.16:", desc: "Initial Release." }
+  - { date: "24.09.20:", desc: "Initial j0nny Release." }

root/etc/services.d/tvheadend/run

@@ -3,4 +3,4 @@
 IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS"
 
 exec \
-        s6-setuidgid abc /usr/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"
+        s6-setuidgid abc /usr/local/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"