Bot Updating Package Versions

rebasing to alpine 3.12

.github/FUNDING.yml

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.10 as buildstage
+FROM lsiobase/alpine:3.12 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -29,6 +29,7 @@ RUN \
 	gcc \
 	gettext-dev \
 	git \
+	gnu-libiconv-dev \
 	gzip \
 	jq \
 	libcurl \
@@ -74,6 +75,7 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
+	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
@@ -101,17 +103,14 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python \
+	python2 \
 	sdl-dev \
 	tar \
 	uriparser-dev \
 	wget \
 	x264-dev \
 	x265-dev \
-	zlib-dev && \
- apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-	gnu-libiconv-dev
+	zlib-dev
 
 RUN \
  echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -128,6 +127,8 @@ RUN \
  git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
  cd /tmp/xmltv && \
  git checkout ${XMLTV_VER} && \
+ echo "**** Fix test for xmltv alpine 3.11 ****" && \
+ patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
  echo "**** Perl 5.26 fixes for XMTLV ****" && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -220,7 +221,7 @@ RUN \
  make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:3.10
+FROM lsiobase/alpine:3.12
 
 # set version label
 ARG BUILD_DATE
@@ -239,6 +240,7 @@ RUN \
 	curl \
 	ffmpeg \
 	ffmpeg-libs \
+	gnu-libiconv \
 	gzip \
 	libcrypto1.1 \
 	libcurl \
@@ -283,6 +285,7 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
+	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
@@ -308,16 +311,14 @@ RUN \
 	perl-xml-treepp \
 	perl-xml-twig \
 	perl-xml-writer \
-	python \
+	py3-requests \
+	python2 \
 	tar \
 	uriparser \
 	wget \
 	x264 \
 	x265 \
 	zlib && \
- apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-	gnu-libiconv && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
  curl -o \
@@ -335,4 +336,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config /recordings
+VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm64v8-3.10 as buildstage
+FROM lsiobase/alpine:arm64v8-3.12 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -29,6 +29,7 @@ RUN \
 	gcc \
 	gettext-dev \
 	git \
+	gnu-libiconv-dev \
 	gzip \
 	jq \
 	libcurl \
@@ -73,6 +74,7 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
+	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
@@ -100,17 +102,14 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python \
+	python2 \
 	sdl-dev \
 	tar \
 	uriparser-dev \
 	wget \
 	x264-dev \
 	x265-dev \
-	zlib-dev && \
- apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-	gnu-libiconv-dev
+	zlib-dev	
 
 RUN \
  echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -127,6 +126,8 @@ RUN \
  git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
  cd /tmp/xmltv && \
  git checkout ${XMLTV_VER} && \
+ echo "**** Fix test for xmltv alpine 3.11 ****" && \
+ patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
  echo "**** Perl 5.26 fixes for XMTLV ****" && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -218,7 +219,7 @@ RUN \
  make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:arm64v8-3.10
+FROM lsiobase/alpine:arm64v8-3.12
 
 # set version label
 ARG BUILD_DATE
@@ -237,6 +238,7 @@ RUN \
 	curl \
 	ffmpeg \
 	ffmpeg-libs \
+	gnu-libiconv \
 	gzip \
 	libcrypto1.1 \
 	libcurl \
@@ -278,6 +280,7 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
+	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
@@ -303,16 +306,14 @@ RUN \
 	perl-xml-treepp \
 	perl-xml-twig \
 	perl-xml-writer \
-	python \
+	py3-requests \
+	python2 \
 	tar \
 	uriparser \
 	wget \
 	x264 \
 	x265 \
 	zlib && \
- apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-	gnu-libiconv && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
  curl -o \
@@ -330,4 +331,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config /recordings
+VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm32v7-3.10 as buildstage
+FROM lsiobase/alpine:arm32v7-3.12 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -29,6 +29,7 @@ RUN \
 	gcc \
 	gettext-dev \
 	git \
+	gnu-libiconv-dev \
 	gzip \
 	jq \
 	libcurl \
@@ -73,6 +74,7 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
+	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
@@ -100,17 +102,14 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python \
+	python2 \
 	sdl-dev \
 	tar \
 	uriparser-dev \
 	wget \
 	x264-dev \
 	x265-dev \
-	zlib-dev && \
- apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-	gnu-libiconv-dev
+	zlib-dev
 
 RUN \
  echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -127,6 +126,8 @@ RUN \
  git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
  cd /tmp/xmltv && \
  git checkout ${XMLTV_VER} && \
+ echo "**** Fix test for xmltv alpine 3.11 ****" && \
+ patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
  echo "**** Perl 5.26 fixes for XMTLV ****" && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -218,7 +219,7 @@ RUN \
  make DESTDIR=/tmp/comskip-build install
 
 ############## runtime stage ##############
-FROM lsiobase/alpine:arm32v7-3.10
+FROM lsiobase/alpine:arm32v7-3.12
 
 # set version label
 ARG BUILD_DATE
@@ -237,6 +238,7 @@ RUN \
 	curl \
 	ffmpeg \
 	ffmpeg-libs \
+	gnu-libiconv \
 	gzip \
 	libcrypto1.1 \
 	libcurl \
@@ -278,6 +280,7 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
+	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
@@ -303,16 +306,14 @@ RUN \
 	perl-xml-treepp \
 	perl-xml-twig \
 	perl-xml-writer \
-	python \
+	py3-requests \
+	python2 \
 	tar \
 	uriparser \
 	wget \
 	x264 \
 	x265 \
 	zlib && \
- apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-	gnu-libiconv && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
  curl -o \
@@ -330,4 +331,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config /recordings
+VOLUME /config

Jenkinsfile

@@ -14,6 +14,8 @@ pipeline {
   environment {
     BUILDS_DISCORD=credentials('build_webhook_url')
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
+    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
+    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     EXT_GIT_BRANCH = 'master'
     EXT_USER = 'tvheadend'
     EXT_REPO = 'tvheadend'
@@ -136,6 +138,8 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
+          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') {
             env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
@@ -154,6 +158,8 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
+          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') {
             env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
@@ -172,6 +178,8 @@ pipeline {
       steps {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
+          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') {
             env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           } else {
@@ -279,6 +287,26 @@ pipeline {
         }
       }
     }
+    /* #######################
+           GitLab Mirroring
+       ####################### */
+    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    stage("GitLab Mirror"){
+      when {
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps{
+        sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
+        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+             "name":"'${LS_REPO}'",
+             "mirror":true,\
+             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+             "issues_access_level":"disabled",\
+             "merge_requests_access_level":"disabled",\
+             "repository_access_level":"enabled",\
+             "visibility":"public"}' '''
+      } 
+    }
     /* ###############
        Build Container
        ############### */
@@ -326,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} || :'''
@@ -353,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} || :'''
@@ -512,17 +544,27 @@ pipeline {
             passwordVariable: 'DOCKERPASS'
           ]
         ]) {
-          echo 'Logging into DockerHub'
+          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}:latest
+                    docker push ${PUSHIMAGE}:latest
+                    docker push ${PUSHIMAGE}:${META_TAG}
+                  done
+               '''
+          }
           sh '''#! /bin/bash
-             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:${META_TAG} \
+                  ${DELETEIMAGE}:latest || :
+                done
              '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:${META_TAG}"
-          sh '''docker rmi \
-                ${IMAGE}:${META_TAG} \
-                ${IMAGE}:latest || :'''
-                
         }
       }
     }
@@ -541,44 +583,72 @@ pipeline {
             passwordVariable: 'DOCKERPASS'
           ]
         ]) {
+          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-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
+                  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}:latest
+                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
+                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
+                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
+                  docker push ${GITHUBIMAGE}:amd64-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
+                  docker push ${GITHUBIMAGE}:latest
+                  docker push ${GITHUBIMAGE}:${META_TAG}
+                  docker push ${GITHUBIMAGE}:arm32v7-latest
+                  docker push ${GITHUBIMAGE}:arm64v8-latest
+               '''
+          }
           sh '''#! /bin/bash
-             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-             '''
-          sh '''#! /bin/bash
-                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'''
-          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
-          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest"
-          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
-          sh "docker push ${IMAGE}:amd64-${META_TAG}"
-          sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
-          sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker push ${IMAGE}:amd64-latest"
-          sh "docker push ${IMAGE}:arm32v7-latest"
-          sh "docker push ${IMAGE}:arm64v8-latest"
-          sh "docker manifest push --purge ${IMAGE}:latest || :"
-          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
-          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:latest"
-          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
-          sh '''docker rmi \
-                ${IMAGE}:amd64-${META_TAG} \
-                ${IMAGE}:amd64-latest \
-                ${IMAGE}:arm32v7-${META_TAG} \
-                ${IMAGE}:arm32v7-latest \
-                ${IMAGE}:arm64v8-${META_TAG} \
-                ${IMAGE}:arm64v8-latest \
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:amd64-${META_TAG} \
+                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
+                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
+                  ${DELETEIMAGE}:arm64v8-latest || :
+                done
+                docker rmi \
                 lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+             '''
         }
       }
     }
@@ -662,16 +732,19 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
     }
+    cleanup {
+      cleanWs()
+    }
   }
 }

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.")
-[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
-[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
+[![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)
@@ -20,17 +20,20 @@ Find us at:
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
-* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
+* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
 * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
 
 # [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
-[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-tvheadend/releases)
-[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
-[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend)
-[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend)
-[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
-[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html)
+
+[![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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
+[![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.
@@ -99,7 +102,7 @@ Compatible with docker-compose v2 schemas.
 
 ```
 ---
-version: "2"
+version: "2.1"
 services:
   tvheadend:
     image: linuxserver/tvheadend
@@ -138,6 +141,23 @@ Container images are configured using parameters passed at runtime (such as thos
 | `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
 | `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. |
 
+## Environment variables from files (Docker secrets)
+
+You can set any environment variable from a file by using a special prepend `FILE__`.
+
+As an example:
+
+```
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
+```
+
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+
+## 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`.
@@ -206,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
@@ -214,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
 
@@ -279,6 +304,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.06.20:** - Update to Alpine 3.12.
+* **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.

package_versions.txt

@@ -1,226 +1,255 @@
-alpine-baselayout-3.1.2-r0
-alpine-keys-2.1-r2
-alsa-lib-1.1.9-r0
-apk-tools-2.10.4-r2
-bash-5.0.0-r0
-bsd-compat-headers-0.7.1-r0
-busybox-1.30.1-r2
-bzip2-1.0.6-r7
-ca-certificates-20190108-r0
-ca-certificates-cacert-20190108-r0
-coreutils-8.31-r0
-curl-7.66.0-r0
-elfutils-libelf-0.168-r2
-expat-2.2.8-r0
-ffmpeg-4.1.4-r0
-ffmpeg-libs-4.1.4-r0
-fontconfig-2.13.1-r0
-freetype-2.10.0-r0
-fribidi-1.0.5-r1
+alpine-baselayout-3.2.0-r7
+alpine-keys-2.2-r0
+alsa-lib-1.2.2-r0
+aom-libs-1.0.0-r1
+apk-tools-2.10.5-r1
+bash-5.0.17-r0
+brotli-libs-1.0.7-r5
+bsd-compat-headers-0.7.2-r3
+busybox-1.31.1-r19
+bzip2-1.0.8-r1
+ca-certificates-20191127-r4
+ca-certificates-bundle-20191127-r4
+coreutils-8.32-r0
+curl-7.69.1-r0
+expat-2.2.9-r1
+ffmpeg-4.3-r0
+ffmpeg-libs-4.3-r0
+fontconfig-2.13.1-r2
+freetype-2.10.2-r0
+fribidi-1.0.9-r0
+fts-1.2.7-r1
 gdbm-1.13-r1
-gmp-6.1.2-r1
+gmp-6.2.0-r0
 gnu-libiconv-1.15-r2
-gnutls-3.6.8-r0
+gnutls-3.6.14-r0
 gzip-1.10-r0
 lame-3.100-r0
-libacl-2.2.52-r6
+libacl-2.2.53-r0
 libass-0.14.0-r0
 libattr-2.4.48-r0
-libbsd-0.9.1-r0
-libbz2-1.0.6-r7
-libc-utils-0.7.1-r0
-libcrypto1.1-1.1.1d-r0
-libcurl-7.66.0-r0
-libdrm-2.4.98-r0
+libbsd-0.10.0-r0
+libbz2-1.0.8-r1
+libc-utils-0.7.2-r3
+libcrypto1.1-1.1.1g-r0
+libcurl-7.69.1-r0
+libdav1d-0.7.0-r0
+libdrm-2.4.102-r0
 libdvbcsa-1.1.0-r1
-libffi-3.2.1-r6
-libgcc-8.3.0-r0
+libelf-0.179-r0
+libffi-3.3-r2
+libgcc-9.3.0-r2
 libgcrypt-1.8.5-r0
-libgpg-error-1.36-r2
-libhdhomerun-libs-20161117-r1
+libgpg-error-1.37-r0
+libhdhomerun-libs-20200225-r0
 libidn-1.35-r0
-libjpeg-turbo-2.0.2-r0
-libogg-1.3.3-r2
-libpciaccess-0.14-r0
+libidn2-2.3.0-r0
+libintl-0.20.2-r0
+libjpeg-turbo-2.0.5-r0
+libogg-1.3.4-r0
+libpciaccess-0.16-r0
 libpng-1.6.37-r1
-libssl1.1-1.1.1d-r0
-libstdc++-8.3.0-r0
-libtasn1-4.14-r0
+libproc-3.3.16-r0
+libssh-0.9.4-r0
+libssl1.1-1.1.1g-r0
+libstdc++-9.3.0-r2
+libtasn1-4.16.0-r1
 libtheora-1.1.1-r14
-libtls-standalone-2.9.1-r0
+libtls-standalone-2.9.1-r1
 libunistring-0.9.10-r0
-liburiparser-0.9.3-r0
-libuuid-2.33.2-r0
-libva-2.4.1-r0
-libva-intel-driver-2.3.0-r0
-libvdpau-1.2-r0
+liburiparser-0.9.3-r1
+libuuid-2.35.2-r0
+libva-2.7.1-r0
+libva-intel-driver-2.4.0-r1
+libvdpau-1.4-r0
 libvorbis-1.3.6-r2
-libvpx-1.8.0-r0
-libx11-1.6.8-r1
+libvpx-1.8.2-r0
+libx11-1.6.9-r0
 libxau-1.0.9-r0
-libxcb-1.13.1-r0
+libxcb-1.14-r1
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-5.0.3-r2
-libxml2-2.9.9-r2
+libxml2-2.9.10-r4
 libxshmfence-1.3-r0
-libxslt-1.1.33-r1
-linux-headers-4.19.36-r0
-linux-pam-1.3.0-r1
-llvm8-libs-8.0.0-r1
-mesa-19.0.6-r0
-mesa-dri-ati-19.0.6-r0
-mesa-glapi-19.0.6-r0
-musl-1.1.22-r3
-musl-utils-1.1.22-r3
-ncurses-libs-6.1_p20190518-r0
-ncurses-terminfo-6.1_p20190518-r0
-ncurses-terminfo-base-6.1_p20190518-r0
-nettle-3.4.1-r1
-nghttp2-libs-1.39.2-r0
-openssl-1.1.1d-r0
+libxslt-1.1.34-r0
+linux-headers-5.4.5-r1
+linux-pam-1.3.1-r4
+llvm10-libs-10.0.0-r2
+mesa-20.0.7-r0
+mesa-dri-ati-20.0.7-r0
+mesa-dri-classic-20.0.7-r0
+mesa-dri-gallium-20.0.7-r0
+mesa-glapi-20.0.7-r0
+mesa-va-gallium-20.0.7-r0
+mesa-vdpau-gallium-20.0.7-r0
+musl-1.1.24-r9
+musl-utils-1.1.24-r9
+ncurses-libs-6.2_p20200523-r0
+ncurses-terminfo-base-6.2_p20200523-r0
+nettle-3.5.1-r1
+nghttp2-libs-1.41.0-r0
+openssl-1.1.1g-r0
 opus-1.3.1-r0
-p11-kit-0.23.16.1-r0
-pcre2-10.33-r0
-perl-5.28.2-r1
-perl-archive-zip-1.64-r0
-perl-b-hooks-endofscope-0.24-r0
-perl-boolean-0.46-r0
-perl-capture-tiny-0.48-r0
-perl-cgi-4.44-r0
-perl-class-data-inheritable-0.08-r0
-perl-class-inspector-1.34-r0
-perl-class-methodmaker-2.24-r3
-perl-class-singleton-1.5-r0
-perl-compress-raw-bzip2-2.086-r1
-perl-compress-raw-zlib-2.086-r1
-perl-cpan-meta-check-0.014-r0
-perl-data-dumper-2.173-r1
-perl-date-manip-6.77-r0
-perl-datetime-1.51-r0
-perl-datetime-format-strptime-1.76-r0
-perl-datetime-locale-1.23-r0
-perl-datetime-timezone-2.19-r0
-perl-dbd-sqlite-1.62-r1
-perl-dbi-1.642-r1
-perl-devel-stacktrace-2.04-r0
-perl-devel-symdump-2.18-r0
-perl-digest-sha1-2.13-r10
-perl-dist-checkconflicts-0.11-r0
-perl-doc-5.28.2-r1
-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.27-r0
-perl-file-temp-0.2309-r0
-perl-file-which-1.23-r0
-perl-getopt-long-2.50-r0
-perl-html-parser-3.72-r3
-perl-html-tagset-3.20-r1
-perl-html-tree-5.07-r0
-perl-http-cookies-6.04-r0
-perl-http-daemon-6.01-r1
-perl-http-date-6.02-r1
-perl-http-message-6.18-r0
-perl-http-negotiate-6.01-r1
+p11-kit-0.23.20-r5
+pcre2-10.35-r0
+perl-5.30.3-r0
+perl-archive-zip-1.68-r0
+perl-b-hooks-endofscope-0.24-r1
+perl-boolean-0.46-r1
+perl-canary-stability-2013-r0
+perl-capture-tiny-0.48-r1
+perl-cgi-4.47-r0
+perl-class-data-inheritable-0.08-r1
+perl-class-inspector-1.36-r1
+perl-class-methodmaker-2.24-r6
+perl-class-singleton-1.5-r1
+perl-common-sense-3.75-r0
+perl-compress-raw-bzip2-2.093-r1
+perl-compress-raw-zlib-2.093-r1
+perl-cpan-meta-check-0.014-r1
+perl-data-dumper-2.173-r3
+perl-date-manip-6.81-r0
+perl-datetime-1.52-r0
+perl-datetime-format-strptime-1.77-r0
+perl-datetime-locale-1.25-r0
+perl-datetime-timezone-2.39-r0
+perl-dbd-sqlite-1.64-r2
+perl-dbi-1.643-r0
+perl-devel-stacktrace-2.04-r1
+perl-devel-symdump-2.18-r1
+perl-digest-sha1-2.13-r12
+perl-dist-checkconflicts-0.11-r1
+perl-doc-5.30.3-r0
+perl-encode-locale-1.05-r2
+perl-eval-closure-0.14-r1
+perl-exception-class-1.44-r1
+perl-exporter-tiny-1.002002-r0
+perl-file-listing-6.04-r2
+perl-file-sharedir-1.116-r1
+perl-file-sharedir-install-0.13-r1
+perl-file-slurp-9999.30-r0
+perl-file-temp-0.2309-r1
+perl-file-which-1.23-r1
+perl-getopt-long-2.51-r1
+perl-html-parser-3.72-r5
+perl-html-tagset-3.20-r2
+perl-html-tree-5.07-r1
+perl-http-cookies-6.08-r0
+perl-http-daemon-6.10-r0
+perl-http-date-6.05-r0
+perl-http-message-6.24-r0
+perl-http-negotiate-6.01-r2
 perl-importer-0.025-r0
-perl-io-1.25-r5
-perl-io-compress-2.086-r0
-perl-io-html-1.001-r1
-perl-io-socket-ssl-2.060-r0
-perl-io-stringy-2.111-r1
-perl-ipc-run3-0.048-r0
-perl-json-2.97000-r0
-perl-libwww-6.39-r1
-perl-lingua-en-numbers-ordinate-1.04-r1
-perl-lingua-preferred-0.2.4-r1
+perl-io-1.42-r0
+perl-io-compress-2.093-r0
+perl-io-html-1.001-r2
+perl-io-socket-ssl-2.068-r0
+perl-io-stringy-2.113-r0
+perl-ipc-run3-0.048-r1
+perl-json-4.02-r0
+perl-json-xs-4.02-r1
+perl-libwww-6.44-r0
+perl-lingua-en-numbers-ordinate-1.04-r2
+perl-lingua-preferred-0.2.4-r2
 perl-list-moreutils-0.428-r0
-perl-list-moreutils-xs-0.428-r1
+perl-list-moreutils-xs-0.428-r3
 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.000036-r0
-perl-module-pluggable-5.2-r0
-perl-module-runtime-0.016-r2
-perl-mro-compat-0.13-r0
-perl-namespace-autoclean-0.28-r0
-perl-namespace-clean-0.27-r0
+perl-lwp-useragent-determined-1.07-r1
+perl-module-build-0.4231-r0
+perl-module-implementation-0.09-r2
+perl-module-metadata-1.000037-r0
+perl-module-pluggable-5.2-r1
+perl-module-runtime-0.016-r3
+perl-mro-compat-0.13-r1
+perl-namespace-autoclean-0.29-r1
+perl-namespace-clean-0.27-r1
 perl-net-http-6.19-r0
-perl-net-libidn-0.12-r6
-perl-net-ssleay-1.85-r5
-perl-package-deprecationmanager-0.17-r0
-perl-package-stash-0.38-r1
-perl-package-stash-xs-0.29-r1
-perl-params-util-1.07-r6
-perl-params-validate-1.29-r1
-perl-params-validationcompiler-0.27-r0
-perl-parse-recdescent-1.967015-r1
-perl-path-class-0.37-r0
-perl-pod-coverage-0.23-r0
-perl-role-tiny-2.000006-r0
-perl-scalar-list-utils-1.50-r1
-perl-scope-guard-0.21-r0
-perl-specio-0.42-r0
-perl-sub-exporter-progressive-0.001013-r0
-perl-sub-identify-0.14-r2
-perl-sub-info-0.002-r0
-perl-sub-install-0.928-r0
-perl-sub-name-0.21-r2
-perl-sub-quote-2.004000-r0
-perl-sub-uplevel-0.2800-r0
-perl-term-progressbar-2.22-r0
-perl-term-readkey-2.38-r1
-perl-term-table-0.012-r0
-perl-test-exception-0.43-r0
-perl-test-fatal-0.014-r1
-perl-test-needs-0.002005-r1
-perl-test-pod-1.52-r0
-perl-test-requires-0.10-r0
-perl-test-simple-1.302164-r0
-perl-test-taint-1.08-r0
-perl-test-warnings-0.026-r0
-perl-test-without-module-0.20-r0
-perl-test2-plugin-nowarnings-0.07-r0
-perl-test2-suite-0.000122-r0
-perl-timedate-2.30-r1
+perl-net-libidn-0.12-r8
+perl-net-ssleay-1.88-r0
+perl-package-deprecationmanager-0.17-r1
+perl-package-stash-0.38-r2
+perl-package-stash-xs-0.29-r3
+perl-params-util-1.07-r8
+perl-params-validate-1.29-r3
+perl-params-validationcompiler-0.30-r0
+perl-parse-recdescent-1.967015-r2
+perl-path-class-0.37-r1
+perl-pod-coverage-0.23-r1
+perl-role-tiny-2.001004-r0
+perl-scalar-list-utils-1.55-r0
+perl-scope-guard-0.21-r1
+perl-specio-0.46-r0
+perl-sub-exporter-progressive-0.001013-r1
+perl-sub-identify-0.14-r4
+perl-sub-info-0.002-r1
+perl-sub-install-0.928-r1
+perl-sub-name-0.26-r1
+perl-sub-quote-2.006006-r0
+perl-sub-uplevel-0.2800-r1
+perl-term-progressbar-2.22-r1
+perl-term-readkey-2.38-r3
+perl-term-table-0.015-r0
+perl-test-exception-0.43-r1
+perl-test-fatal-0.014-r2
+perl-test-needs-0.002006-r0
+perl-test-pod-1.52-r1
+perl-test-requires-0.11-r0
+perl-test-simple-1.302175-r0
+perl-test-taint-1.08-r2
+perl-test-warnings-0.030-r0
+perl-test-without-module-0.20-r1
+perl-test2-plugin-nowarnings-0.08-r1
+perl-test2-suite-0.000129-r0
+perl-timedate-2.33-r0
 perl-try-tiny-0.30-r1
-perl-unicode-string-2.09-r7
+perl-types-serialiser-1.0-r2
+perl-unicode-string-2.10-r1
 perl-uri-1.76-r0
-perl-variable-magic-0.62-r1
-perl-www-robotrules-6.02-r1
-perl-xml-libxml-2.0134-r2
-perl-xml-libxslt-1.96-r1
-perl-xml-namespacesupport-1.12-r0
-perl-xml-parser-2.44-r5
-perl-xml-sax-0.99-r2
-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-r1
-python2-2.7.16-r1
-readline-8.0.0-r0
-scanelf-1.2.3-r0
-sdl2-2.0.10-r0
-shadow-4.6-r2
-sqlite-libs-3.28.0-r1
-ssl_client-1.30.1-r2
-tar-1.32-r0
-tzdata-2019c-r0
-uriparser-0.9.3-r0
-v4l-utils-libs-1.16.6-r0
-wayland-libs-client-1.17.0-r0
-wget-1.20.3-r0
-x264-20180304-r1
-x264-libs-20180304-r1
-x265-3.0-r0
-x265-libs-3.0-r0
-xvidcore-1.3.4-r1
-xz-5.2.4-r0
-xz-libs-5.2.4-r0
-zlib-1.2.11-r1
+perl-variable-magic-0.62-r3
+perl-www-robotrules-6.02-r2
+perl-xml-libxml-2.0205-r0
+perl-xml-libxslt-1.99-r0
+perl-xml-namespacesupport-1.12-r1
+perl-xml-parser-2.46-r0
+perl-xml-sax-1.02-r0
+perl-xml-sax-base-1.09-r1
+perl-xml-treepp-0.43-r2
+perl-xml-twig-3.52-r2
+perl-xml-writer-0.625-r3
+perl-yaml-syck-1.32-r0
+procps-3.3.16-r0
+py3-appdirs-1.4.4-r1
+py3-certifi-2020.4.5.1-r0
+py3-chardet-3.0.4-r4
+py3-idna-2.9-r0
+py3-ordered-set-4.0.1-r0
+py3-packaging-20.4-r0
+py3-parsing-2.4.7-r0
+py3-requests-2.23.0-r0
+py3-setuptools-47.0.0-r0
+py3-six-1.15.0-r0
+py3-urllib3-1.25.9-r0
+python2-2.7.18-r0
+python3-3.8.3-r0
+readline-8.0.4-r0
+scanelf-1.2.6-r0
+sdl2-2.0.12-r1
+shadow-4.8.1-r0
+sqlite-libs-3.32.1-r0
+ssl_client-1.31.1-r19
+tar-1.32-r1
+tzdata-2020a-r0
+uriparser-0.9.3-r1
+v4l-utils-libs-1.20.0-r0
+wayland-libs-client-1.18.0-r4
+wget-1.20.3-r1
+x264-20191119-r1
+x264-libs-20191119-r1
+x265-3.3-r1
+x265-libs-3.3-r1
+xvidcore-1.3.7-r1
+xz-5.2.5-r0
+xz-libs-5.2.5-r0
+zlib-1.2.11-r3
+zstd-libs-1.4.5-r0

patches/cpanfile

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

patches/test_tv_imdb.t.patch

@@ -0,0 +1,20 @@
+---
+ t/test_tv_imdb.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t
+index ad504464..4dc281a1 100755
+--- a/t/test_tv_imdb.t
++++ b/t/test_tv_imdb.t
+@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) {
+     my $output="$tmpDir/".File::Basename::basename($input)."-output.xml";
+ 
+     # Make temporary directory and split into it.
+-    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
++    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
+     if ( $input=~m/movies-only/ ) {
+-	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
++	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
+     }
+     #print STDERR "\nRUN:$cmd\n";
+     my $r = system($cmd);

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,6 +126,9 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.06.20:", desc: "Update to Alpine 3.12." }
+  - { 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." }