Bot Updating Package Versions

2020-09-17 23:07:42 -04:00 · 2020-09-15 21:49:14 +01:00 · 2020-09-10 22:36:59 -04:00 · 2020-09-04 02:34:50 +00:00 · 2020-08-20 22:03:42 -04:00 · 2020-08-07 02:46:09 +00:00
12 changed files with 445 additions and 345 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
+github: linuxserver
 open_collective: linuxserver
--- a/.github/workflows/greetings.yml
+++ b/.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 }}
--- a/.github/workflows/stale.yml
+++ b/.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 }}
--- a/25
+++ b/25
@@ -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
--- a/Dockerfile.aarch64
+++ b/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
--- a/Dockerfile.armhf
+++ b/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
--- a/169
+++ b/169
@@ -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(
@@ -138,7 +138,6 @@ pipeline {
      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') {
@@ -159,7 +158,6 @@ pipeline {
      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') {
@@ -247,7 +244,7 @@ pipeline {
                cd ${TEMPDIR}/repo/${LS_REPO}
                git checkout -f master
                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}
@@ -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} || :'''
@@ -541,27 +542,24 @@ 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}:latest
+                    docker push ${PUSHIMAGE}:latest
+                    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 || :
@@ -583,69 +581,62 @@ 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-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
-                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 \
@@ -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=master -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} '''
        }
      }
    }
--- a/README.md
+++ b/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%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.
@@ -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,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.
--- a/package_versions.txt
+++ b/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-r3
-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-r2
+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-r1
+expat-2.2.9-r1
+ffmpeg-4.3.1-r0
+ffmpeg-libs-4.3.1-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.15-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-r1
+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.3-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-r1
+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.12-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-r5
 libxshmfence-1.3-r0
-libxslt-1.1.33-r2
-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-r2
-ssl_client-1.30.1-r3
-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.5-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
--- a/patches/cpanfile
+++ b/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' ;
--- a/patches/test_tv_imdb.t.patch
+++ b/patches/test_tv_imdb.t.patch
@@ -0,0 +1,20 @@
+---
+ t/test_tv_imdb.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t
+index ad504464..4dc281a1 100755
+--- a/t/test_tv_imdb.t
+++ b/t/test_tv_imdb.t
+@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) {
+     my $output="$tmpDir/".File::Basename::basename($input)."-output.xml";
+ 
+     # Make temporary directory and split into it.
+-    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
+    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
+     if ( $input=~m/movies-only/ ) {
+-	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
+	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
+     }
+     #print STDERR "\nRUN:$cmd\n";
+     my $r = system($cmd);
--- a/readme-vars.yml
+++ b/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." }
Author	SHA1	Message	Date
LinuxServer-CI	0315bbca19	Bot Updating Package Versions	2020-09-17 23:07:42 -04:00
LinuxServer-CI	2d9247905a	Bot Updating Package Versions	2020-09-15 21:49:14 +01:00
LinuxServer-CI	4cb33cc26b	Bot Updating Package Versions	2020-09-10 22:36:59 -04:00
LinuxServer-CI	233fd91f47	Bot Updating Package Versions	2020-09-04 02:34:50 +00:00
LinuxServer-CI	449b4e952b	Bot Updating Templated Files	2020-08-20 22:03:42 -04:00
LinuxServer-CI	b2c9114b8c	Bot Updating Package Versions	2020-08-07 02:46:09 +00:00
LinuxServer-CI	27ffc2a5b0	Bot Updating Templated Files	2020-08-07 02:04:24 +00:00
LinuxServer-CI	458e79fb5d	Bot Updating Templated Files	2020-08-07 02:03:09 +00:00
LinuxServer-CI	9072267321	Bot Updating Package Versions	2020-07-30 23:55:52 -04:00
LinuxServer-CI	1402cfd627	Bot Updating Package Versions	2020-07-12 16:47:36 -04:00
LinuxServer-CI	e783cbddd4	Bot Updating Package Versions	2020-06-26 02:33:58 +00:00
LinuxServer-CI	8851174fde	Bot Updating Package Versions	2020-06-19 04:43:53 +02:00
LinuxServer-CI	5d7727eb67	Bot Updating Package Versions	2020-06-11 22:42:32 -04:00
LinuxServer-CI	8d3a0879a5	Bot Updating Package Versions	2020-06-04 22:31:30 -04:00
LinuxServer-CI	a86b31a466	Bot Updating Package Versions	2020-06-03 11:30:25 -04:00
LinuxServer-CI	5c2472e875	Bot Updating Templated Files	2020-06-03 14:28:15 +00:00
chbmb	e2ca758bcd	Merge pull request #166 from linuxserver/master-3.12 rebasing to alpine 3.12	2020-06-03 15:27:02 +01:00
thelamer	be4d765182	rebasing to alpine 3.12	2020-06-02 13:52:12 -07:00
LinuxServer-CI	3307f71d6a	Bot Updating Package Versions	2020-05-29 03:36:28 +00:00
LinuxServer-CI	78b70217f9	Bot Updating Templated Files	2020-05-29 04:55:42 +02:00
LinuxServer-CI	e9f324cf83	Bot Updating Package Versions	2020-05-08 02:53:46 +00:00
LinuxServer-CI	c83501cda1	Bot Updating Package Versions	2020-05-01 02:56:42 +00:00
LinuxServer-CI	590c526d4f	Bot Updating Templated Files	2020-05-01 02:02:57 +00:00
LinuxServer-CI	b1e3a2b76c	Bot Updating Package Versions	2020-04-24 04:28:26 +00:00
LinuxServer-CI	e46a100668	Bot Updating Package Versions	2020-04-16 22:40:03 -04:00
LinuxServer-CI	a264297038	Bot Updating Templated Files	2020-04-10 02:03:23 +00:00
LinuxServer-CI	1d382f1e2d	Bot Updating Package Versions	2020-04-02 22:38:19 -04:00
LinuxServer-CI	92de6b3807	Bot Updating Package Versions	2020-03-27 05:48:39 +00:00
LinuxServer-CI	de6a3f09aa	Bot Updating Package Versions	2020-03-06 05:41:35 +00:00
LinuxServer-CI	27de84621d	Bot Updating Package Versions	2020-03-01 20:58:08 +00:00
LinuxServer-CI	af32e275fc	Bot Updating Templated Files	2020-03-01 20:02:16 +00:00
j0nnymoe	b53c4e8a95	Merge pull request #160 from hotio/patch-1 Fix picons website url	2020-03-01 20:01:21 +00:00
hotio	da780f88bc	Fix picons website url Use the current new domain of my project picons.eu instead of the outdated picons.xyz	2020-03-01 18:48:52 +01:00
LinuxServer-CI	c293456f31	Bot Updating Package Versions	2020-02-28 04:16:08 +00:00
LinuxServer-CI	0d8c5aa390	Bot Updating Package Versions	2020-02-14 03:52:59 +00:00
LinuxServer-CI	aa73a745f3	Bot Updating Package Versions	2020-02-10 17:06:58 -05:00
tobbenb	9d7a35ba91	Remove docker-tvheadend.md file	2020-02-10 13:32:00 -08:00
tobbenb	7253c86d23	Forgot requests package for arm	2020-02-10 13:32:00 -08:00
tobbenb	317114ce56	Add requests and perl-json-xs package	2020-02-10 13:32:00 -08:00
LinuxServer-CI	922de73700	Bot Updating Package Versions	2020-02-07 03:49:33 +00:00
LinuxServer-CI	0dff29da35	Bot Updating Package Versions	2020-01-17 03:30:14 +00:00
LinuxServer-CI	6d325b1f7e	Bot Updating Package Versions	2020-01-09 22:36:43 -05:00
LinuxServer-CI	f2423c1628	Bot Updating Package Versions	2019-12-28 02:34:07 +01:00
LinuxServer-CI	6a902e358e	Bot Updating Templated Files	2019-12-28 01:06:03 +00:00
tobbenb	05e3e94c17	Forgot alot of shit	2019-12-27 17:05:03 -08:00
tobbenb	f69f0308e8	Update to Alpine 3.11	2019-12-27 17:05:03 -08:00
LinuxServer-CI	0aa53af054	Bot Updating Package Versions	2019-12-27 03:37:00 +00:00