Bot Updating Package Versions

Rebasing to Alpine 3.10

.github/ISSUE_TEMPLATE.md

@@ -1,34 +1,21 @@
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support.
-
 <!--- Provide a general summary of the issue in the Title above -->
 
-------------------------------
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+	
 
-## Expected Behavior
-<!--- Tell us what should happen -->
+<!--- If you have an issue with the project, please provide us with the following information -->
 
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
+<!---  Host OS -->
+<!--- Command line users, your run/create command, GUI/Unraid users, a screenshot of your template settings. -->
+<!--- Docker log output, docker log <container-name>      -->
+<!--- Mention if you're using symlinks on any of the volume mounts. -->
 
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
 
-## Environment
-**OS:**      
-**CPU architecture:** x86_64/arm32/arm64      
-**How docker service was installed:**      
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+<!--- If you have a suggestion or fix for the project, please provide us with the following information -->
 
-## Command used to create docker container (run/create/compose/screenshot)
-<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
+<!--- What you think your suggestion brings to the project, or fixes with the project -->
+<!--- If it's a fix, would it be better suited as a Pull request to the repo ? -->
+
+##  Thanks, team linuxserver.io
 
-## Docker logs
-<!--- Provide a full docker log, output of "docker logs tvheadend" -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,34 +6,10 @@
 
 <!--- Before submitting a pull request please check the following -->
 
-<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  --> 
-<!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
+<!---  That you have made a branch in your fork, we'd rather not merge from your master -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
-<!--- We maintain a changelog of major revisions to the container at the end of readme-vars.yml in the root of this repository, please add your changes there if appropriate -->
+<!---  -->
 
+##  Thanks, team linuxserver.io
 
-<!--- Coding guidelines: -->
-<!--- 1. Installed packages in the Dockerfiles should be in alphabetical order -->
-<!--- 2. Changes to Dockerfile should be replicated in Dockerfile.armhf and Dockerfile.aarch64 if applicable -->
-<!--- 3. Indentation style (tabs vs 4 spaces vs 1 space) should match the rest of the document -->
-<!--- 4. Readme is auto generated from readme-vars.yml, make your changes there -->
-
-------------------------------
-
-We welcome all PR’s though this doesn’t guarantee it will be accepted.
-
-## Description:
-<!--- Describe your changes in detail -->
-
-## Benefits of this PR and context:
-<!--- Please explain why we should accept this PR. If this fixes an outstanding bug, please reference the issue # -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-
-## Source / References:
-<!--- Please include any forum posts/github links relevant to the PR -->

Dockerfile

@@ -3,11 +3,12 @@ FROM lsiobase/alpine:3.10 as buildstage
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG TVH_VER="release/4.2"
+ARG XMLTV_VER="v0.5.70"
+ARG TVHEADEND_COMMIT
 
 # environment settings
 ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
 ENV HOME="/config"
 
 # copy patches
@@ -31,18 +32,16 @@ RUN \
 	git \
 	gzip \
 	jq \
-	libcurl \
-	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
-	libva-dev \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	mercurial \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -78,7 +77,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -120,7 +118,7 @@ RUN \
 
 RUN \
  echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches
 
 RUN \
@@ -141,44 +139,41 @@ RUN \
  make test && \
  make DESTDIR=/tmp/xmltv-build install
 
+RUN \
+ echo "**** compile dvb-apps ****" && \
+ hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
+ cd /tmp/dvb-apps && \
+ make -C lib && \
+ make -C lib DESTDIR=/tmp/dvbapps-build install && \
+ cp -pr /tmp/dvbapps-build/usr/* /usr/
+
 RUN \
  echo "**** compile tvheadend ****" && \
  if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
 	| jq -r '. | .sha'); \
  fi && \
  mkdir -p \
-	/tmp/tvheadend && \
+        /tmp/tvheadend && \
  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
  cd /tmp/tvheadend && \
  git checkout ${TVHEADEND_COMMIT} && \
  ./configure \
-	`#Encoding` \
+	--disable-avahi \
+	--disable-bintray_cache \
+	--disable-dbus_1 \
 	--disable-ffmpeg_static \
+	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
+	--disable-libmfx_static \
 	--disable-libtheora_static \
-	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
 	--enable-pngquant \
-	--enable-trace \
-	--enable-vaapi \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -241,18 +236,14 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
-	libva \
-	libva-intel-driver \
-	mesa-dri-ati \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -287,7 +278,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -327,6 +317,7 @@ RUN \
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
+COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/

Dockerfile.aarch64

@@ -3,11 +3,12 @@ FROM lsiobase/alpine:arm64v8-3.10 as buildstage
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG TVH_VER="release/4.2"
+ARG XMLTV_VER="v0.5.70"
+ARG TVHEADEND_COMMIT
 
 # environment settings
 ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
 ENV HOME="/config"
 
 # copy patches
@@ -31,17 +32,16 @@ RUN \
 	git \
 	gzip \
 	jq \
-	libcurl \
-	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	mercurial \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,7 +77,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -119,7 +118,7 @@ RUN \
 
 RUN \
  echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches
 
 RUN \
@@ -140,11 +139,19 @@ RUN \
  make test && \
  make DESTDIR=/tmp/xmltv-build install
 
+RUN \
+ echo "**** compile dvb-apps ****" && \
+ hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
+ cd /tmp/dvb-apps && \
+ make -C lib && \
+ make -C lib DESTDIR=/tmp/dvbapps-build install && \
+ cp -pr /tmp/dvbapps-build/usr/* /usr/
+
 RUN \
  echo "**** compile tvheadend ****" && \
  if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
  fi && \
  mkdir -p \
         /tmp/tvheadend && \
@@ -152,31 +159,21 @@ RUN \
  cd /tmp/tvheadend && \
  git checkout ${TVHEADEND_COMMIT} && \
  ./configure \
-	`#Encoding` \
+	--disable-avahi \
+	--disable-bintray_cache \
+	--disable-dbus_1 \
 	--disable-ffmpeg_static \
+	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
+	--disable-libmfx_static \
 	--disable-libtheora_static \
-	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
 	--enable-pngquant \
-	--enable-trace \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -239,15 +236,14 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -282,7 +278,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -322,6 +317,7 @@ RUN \
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
+COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/

Dockerfile.armhf

@@ -3,11 +3,12 @@ FROM lsiobase/alpine:arm32v7-3.10 as buildstage
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG TVH_VER="release/4.2"
+ARG XMLTV_VER="v0.5.70"
+ARG TVHEADEND_COMMIT
 
 # environment settings
 ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
 ENV HOME="/config"
 
 # copy patches
@@ -31,17 +32,16 @@ RUN \
 	git \
 	gzip \
 	jq \
-	libcurl \
-	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	mercurial \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,7 +77,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -119,7 +118,7 @@ RUN \
 
 RUN \
  echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches
 
 RUN \
@@ -140,11 +139,19 @@ RUN \
  make test && \
  make DESTDIR=/tmp/xmltv-build install
 
+RUN \
+ echo "**** compile dvb-apps ****" && \
+ hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
+ cd /tmp/dvb-apps && \
+ make -C lib && \
+ make -C lib DESTDIR=/tmp/dvbapps-build install && \
+ cp -pr /tmp/dvbapps-build/usr/* /usr/
+
 RUN \
  echo "**** compile tvheadend ****" && \
  if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
  fi && \
  mkdir -p \
         /tmp/tvheadend && \
@@ -152,31 +159,21 @@ RUN \
  cd /tmp/tvheadend && \
  git checkout ${TVHEADEND_COMMIT} && \
  ./configure \
-	`#Encoding` \
+	--disable-avahi \
+	--disable-bintray_cache \
+	--disable-dbus_1 \
 	--disable-ffmpeg_static \
+	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
+	--disable-libmfx_static \
 	--disable-libtheora_static \
-	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
 	--enable-pngquant \
-	--enable-trace \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -239,15 +236,14 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -282,7 +278,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -322,6 +317,7 @@ RUN \
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
+COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/

Jenkinsfile

@@ -2,10 +2,6 @@ pipeline {
   agent {
     label 'X86-64-MULTI'
   }
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60'))
-    parallelsAlwaysFailFast()
-  }
   // Input to determine if this is a package check
   parameters {
      string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
@@ -14,7 +10,7 @@ pipeline {
   environment {
     BUILDS_DISCORD=credentials('build_webhook_url')
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
-    EXT_GIT_BRANCH = 'master'
+    EXT_GIT_BRANCH = 'release/4.2'
     EXT_USER = 'tvheadend'
     EXT_REPO = 'tvheadend'
     BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
@@ -42,7 +38,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':release-4.2 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -56,7 +52,22 @@ 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.LICENSE_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e LICENSE ] ; then
+                         cat LICENSE | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
+          env.FUNDING_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e ./.github/FUNDING.yml ] ; then
+                         cat ./.github/FUNDING.yml | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -127,10 +138,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a release-4.2 build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "release-4.2"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -148,7 +159,7 @@ pipeline {
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "release-4.2"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -215,7 +226,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "release-4.2"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -226,33 +237,36 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
-              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=release-4.2 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker pull linuxserver/doc-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=release-4.2 -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
+              if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
+                 [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
-                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f release-4.2
+                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
-                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml
                 cd ${TEMPDIR}/repo/${LS_REPO}/
-                git add ${TEMPLATED_FILES}
-                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
               fi
               mkdir -p ${TEMPDIR}/gitbook
               git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                 cd ${TEMPDIR}/gitbook/docker-documentation/
                 git add images/docker-${CONTAINER_NAME}.md
-                git commit -m 'Bot Updating Documentation'
+                git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
               fi
               rm -Rf ${TEMPDIR}'''
@@ -266,7 +280,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "release-4.2"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -365,7 +379,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "release-4.2"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -393,7 +407,7 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f release-4.2
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -417,7 +431,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "release-4.2"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -431,7 +445,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "release-4.2"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -516,12 +530,12 @@ pipeline {
           sh '''#! /bin/bash
              echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
              '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:latest"
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:release-4.2"
+          sh "docker push ${IMAGE}:release-4.2"
           sh "docker push ${IMAGE}:${META_TAG}"
           sh '''docker rmi \
                 ${IMAGE}:${META_TAG} \
-                ${IMAGE}:latest || :'''
+                ${IMAGE}:release-4.2 || :'''
                 
         }
       }
@@ -551,32 +565,32 @@ pipeline {
                   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 tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-release-4.2"
+          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-release-4.2"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-release-4.2"
           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 push ${IMAGE}:amd64-release-4.2"
+          sh "docker push ${IMAGE}:arm32v7-release-4.2"
+          sh "docker push ${IMAGE}:arm64v8-release-4.2"
+          sh "docker manifest push --purge ${IMAGE}:release-4.2 || :"
+          sh "docker manifest create ${IMAGE}:release-4.2 ${IMAGE}:amd64-release-4.2 ${IMAGE}:arm32v7-release-4.2 ${IMAGE}:arm64v8-release-4.2"
+          sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm32v7-release-4.2 --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm64v8-release-4.2 --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}:release-4.2"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
           sh '''docker rmi \
                 ${IMAGE}:amd64-${META_TAG} \
-                ${IMAGE}:amd64-latest \
+                ${IMAGE}:amd64-release-4.2 \
                 ${IMAGE}:arm32v7-${META_TAG} \
-                ${IMAGE}:arm32v7-latest \
+                ${IMAGE}:arm32v7-release-4.2 \
                 ${IMAGE}:arm64v8-${META_TAG} \
-                ${IMAGE}:arm64v8-latest \
+                ${IMAGE}:arm64v8-release-4.2 \
                 lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
                 lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
         }
@@ -585,7 +599,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "release-4.2"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -597,17 +611,17 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to release-4.2",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
               echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "release-4.2",\
                      "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                      "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }

README.md

@@ -82,15 +82,14 @@ docker create \
   -v <path to data>:/config \
   -v <path to recordings>:/recordings \
   --device /dev/dri:/dev/dri `#optional` \
-  --device /dev/dvb:/dev/dvb `#optional` \
+  --device /dev/drb:/dev/dvb `#optional` \
   --restart unless-stopped \
   linuxserver/tvheadend
 ```
 
 #### Host vs. Bridge
 
-If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
-If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
+If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.
 
 
 ### docker-compose
@@ -117,7 +116,7 @@ services:
       - 9982:9982
     devices:
       - /dev/dri:/dev/dri #optional
-      - /dev/dvb:/dev/dvb #optional
+      - /dev/drb:/dev/dvb #optional
     restart: unless-stopped
 ```
 
@@ -279,14 +278,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **02.10.19:** - Improve permission fixing on render & dvb devices.
-* **18.08.19:** - Add AMD drivers.
+* **02.10.19:** - Improve permissions fixing on render & dvb devices.
 * **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
-* **01.03.19:** - Bump xmltv to 0.6.1.
-* **28.02.19:** - add perl-lwp-useragent-determined.
 * **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
 * **14.02.19:** - Add picons path to config.
 * **15.01.19:** - Add pipeline logic and multi arch.

jenkins-vars.yml

@@ -3,11 +3,11 @@
 # jenkins variables
 project_name: docker-tvheadend
 external_type: github_commit
-release_type: stable
-release_tag: latest
-ls_branch: master
+release_type: prerelease
+release_tag: release-4.2
+ls_branch: release-4.2
 repo_vars:
-  - EXT_GIT_BRANCH = 'master'
+  - EXT_GIT_BRANCH = 'release/4.2'
   - EXT_USER = 'tvheadend'
   - EXT_REPO = 'tvheadend'
   - BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'

package_versions.txt

@@ -10,7 +10,6 @@ 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
@@ -32,10 +31,9 @@ libc-utils-0.7.1-r0
 libcrypto1.1-1.1.1d-r0
 libcurl-7.66.0-r0
 libdrm-2.4.98-r0
-libdvbcsa-1.1.0-r1
 libffi-3.2.1-r6
 libgcc-8.3.0-r0
-libgcrypt-1.8.5-r0
+libgcrypt-1.8.4-r2
 libgpg-error-1.36-r2
 libhdhomerun-libs-20161117-r1
 libidn-1.35-r0
@@ -43,6 +41,10 @@ libjpeg-turbo-2.0.2-r0
 libogg-1.3.3-r2
 libpciaccess-0.14-r0
 libpng-1.6.37-r1
+libressl-2.7.5-r0
+libressl2.7-libcrypto-2.7.5-r0
+libressl2.7-libssl-2.7.5-r0
+libressl2.7-libtls-2.7.5-r0
 libssl1.1-1.1.1d-r0
 libstdc++-8.3.0-r0
 libtasn1-4.14-r0
@@ -52,7 +54,6 @@ 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
 libvorbis-1.3.6-r2
 libvpx-1.8.0-r0
@@ -63,14 +64,9 @@ libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-5.0.3-r2
 libxml2-2.9.9-r2
-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
@@ -78,7 +74,6 @@ 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
 opus-1.3.1-r0
 p11-kit-0.23.16.1-r0
 pcre2-10.33-r0
@@ -141,7 +136,6 @@ perl-lingua-preferred-0.2.4-r1
 perl-list-moreutils-0.428-r0
 perl-list-moreutils-xs-0.428-r1
 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
@@ -208,7 +202,7 @@ 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
+sqlite-libs-3.28.0-r0
 ssl_client-1.30.1-r2
 tar-1.32-r0
 tzdata-2019b-r0

readme-vars.yml

@@ -53,15 +53,14 @@ opt_param_usage_include_ports: false
 opt_param_device_map: true
 opt_param_devices:
   - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi)." }
-  - { device_path: "/dev/dvb", device_host_path: "/dev/dvb", desc: "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." }
+  - { device_path: "/dev/dvb", device_host_path: "/dev/drb", desc: "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." }
 opt_cap_add_param: false
 optional_block_1: true
 optional_block_1_items:
   - |
     #### Host vs. Bridge
 
-    If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
-    If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
+    If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.
 
 # application setup block
 app_setup_block_enabled: true
@@ -126,14 +125,11 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
-  - { date: "18.08.19:", desc: "Add AMD drivers." }
+  - { date: "02.10.19:", desc: "Improve permissions fixing on render & dvb devices." }
   - { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - { date: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
-  - { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }
   - { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }
   - { date: "14.02.19:", desc: "Add picons path to config." }
   - { date: "15.01.19:", desc: "Add pipeline logic and multi arch." }

root/defaults/config

@@ -1,7 +1,7 @@
 {
-        "prefer_picon": true,
-        "chiconpath": "file:///picons/%C.png",
-        "piconpath": "file:///picons/",
-        "piconscheme": 0,
-        "chiconscheme": 2
+	"prefer_picon": true,
+	"chiconpath": "file:///picons/%C.png",
+	"piconpath": "file:///picons/",
+	"piconscheme": 0,
+	"chiconscheme": 2
 }