Bot Updating Package Versions

Bot Updating Templated Files
Merge pull request #117 from danofun/master
2019-03-01 22:19:05 +00:00 · 2019-03-01 16:35:30 -05:00 · 2019-03-01 16:34:31 -05:00 · 2019-03-01 16:16:43 -05:00 · 2019-02-28 09:34:40 -05:00 · 2019-02-27 21:21:15 -05:00
10 changed files with 144 additions and 126 deletions
--- a/59
+++ b/59
@@ -3,12 +3,11 @@ FROM lsiobase/alpine:3.8 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-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
@@ -32,16 +31,18 @@ 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 \
-	mercurial \
+	openssl-dev \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,6 +78,7 @@ 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 \
@@ -108,7 +110,7 @@ RUN \
 	x265-dev \
 	zlib-dev && \
 apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev

 RUN \
@@ -118,7 +120,7 @@ RUN \

 RUN \
 echo "**** install perl modules for xmltv ****" && \
- curl -L http://cpanmin.us | perl - App::cpanminus && \
+ curl -L https://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches

 RUN \
@@ -139,41 +141,44 @@ 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/${TVH_VER} \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
 	| 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 \
-	--disable-avahi \
-	--disable-bintray_cache \
-	--disable-dbus_1 \
+	`#Encoding` \
 	--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 \
@@ -236,14 +241,17 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.0 \
-	libcurl	\
+	libcurl \
+	libdvbcsa \
 	libhdhomerun-libs \
-	libressl \
 	libssl1.0 \
+	libva \
+	libva-intel-driver \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
+	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -278,6 +286,7 @@ 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 \
@@ -306,7 +315,7 @@ RUN \
 	x265 \
 	zlib && \
 apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv && \
 echo "**** Add Picons ****" && \
 mkdir -p /picons && \
@@ -323,14 +332,12 @@ 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/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
 COPY root/ /

-
 # ports and volumes
 EXPOSE 9981 9982
 VOLUME /config /recordings
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -3,12 +3,11 @@ FROM lsiobase/alpine.arm64:3.8 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-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
@@ -32,16 +31,17 @@ RUN \
 	git \
 	gzip \
 	jq \
+	libcurl \
+	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
-	libressl-dev \
 	libtool \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	mercurial \
+	openssl-dev \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,6 +77,7 @@ 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 \
@@ -108,7 +109,7 @@ RUN \
 	x265-dev \
 	zlib-dev && \
 apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev

 RUN \
@@ -118,7 +119,7 @@ RUN \

 RUN \
 echo "**** install perl modules for xmltv ****" && \
- curl -L http://cpanmin.us | perl - App::cpanminus && \
+ curl -L https://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches

 RUN \
@@ -139,19 +140,11 @@ 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/${TVH_VER} \
-	| jq -r '. | .sha'); \
+        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+        | jq -r '. | .sha'); \
 fi && \
 mkdir -p \
        /tmp/tvheadend && \
@@ -159,21 +152,31 @@ RUN \
 cd /tmp/tvheadend && \
 git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
-	--disable-avahi \
-	--disable-bintray_cache \
-	--disable-dbus_1 \
+	`#Encoding` \
 	--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,14 +242,15 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.0 \
-	libcurl	\
+	libcurl \
+	libdvbcsa \
 	libhdhomerun-libs \
-	libressl \
 	libssl1.0 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
+	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -281,6 +285,7 @@ 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 \
@@ -309,7 +314,7 @@ RUN \
 	x265 \
 	zlib && \
 apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv && \
 echo "**** Add Picons ****" && \
 mkdir -p /picons && \
@@ -326,14 +331,12 @@ 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/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
 COPY root/ /

-
 # ports and volumes
 EXPOSE 9981 9982
 VOLUME /config /recordings
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,12 +3,11 @@ FROM lsiobase/alpine.armhf:3.8 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-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
@@ -32,16 +31,17 @@ RUN \
 	git \
 	gzip \
 	jq \
+	libcurl \
+	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
-	libressl-dev \
 	libtool \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	mercurial \
+	openssl-dev \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,6 +77,7 @@ 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 \
@@ -108,7 +109,7 @@ RUN \
 	x265-dev \
 	zlib-dev && \
 apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev

 RUN \
@@ -118,7 +119,7 @@ RUN \

 RUN \
 echo "**** install perl modules for xmltv ****" && \
- curl -L http://cpanmin.us | perl - App::cpanminus && \
+ curl -L https://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches

 RUN \
@@ -139,19 +140,11 @@ 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/${TVH_VER} \
-	| jq -r '. | .sha'); \
+        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+        | jq -r '. | .sha'); \
 fi && \
 mkdir -p \
        /tmp/tvheadend && \
@@ -159,21 +152,31 @@ RUN \
 cd /tmp/tvheadend && \
 git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
-	--disable-avahi \
-	--disable-bintray_cache \
-	--disable-dbus_1 \
+	`#Encoding` \
 	--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,14 +242,15 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.0 \
-	libcurl	\
+	libcurl \
+	libdvbcsa \
 	libhdhomerun-libs \
-	libressl \
 	libssl1.0 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
+	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -281,6 +285,7 @@ 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 \
@@ -309,7 +314,7 @@ RUN \
 	x265 \
 	zlib && \
 apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv && \
 echo "**** Add Picons ****" && \
 mkdir -p /picons && \
@@ -326,14 +331,12 @@ 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/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
 COPY root/ /

-
 # ports and volumes
 EXPOSE 9981 9982
 VOLUME /config /recordings
--- a/72
+++ b/72
@@ -10,7 +10,7 @@ pipeline {
  environment {
    BUILDS_DISCORD=credentials('build_webhook_url')
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
-    EXT_GIT_BRANCH = 'release/4.2'
+    EXT_GIT_BRANCH = 'master'
    EXT_USER = 'tvheadend'
    EXT_REPO = 'tvheadend'
    BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
@@ -38,7 +38,7 @@ pipeline {
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''',
+            script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
            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' ''',
@@ -122,10 +122,10 @@ pipeline {
        }
      }
    }
-    // If this is a release-4.2 build use live docker endpoints
+    // If this is a master build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "release-4.2"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -143,7 +143,7 @@ pipeline {
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "release-4.2"}
+        not {branch "master"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -181,7 +181,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "release-4.2"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -192,13 +192,13 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=release-4.2 -v ${TEMPDIR}:/ansible/jenkins 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 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
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -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 }')" ]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f release-4.2
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                cd ${TEMPDIR}/repo/${LS_REPO}/
@@ -229,7 +229,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "release-4.2"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -332,7 +332,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "release-4.2"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -353,14 +353,14 @@ pipeline {
                  chmod 777 /tmp/package_versions.txt'
              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apt list -qq --installed | cut -d" " -f1-2 > /tmp/package_versions.txt && \
+                  apt list -qq --installed > /tmp/package_versions.txt && \
                  chmod 777 /tmp/package_versions.txt'
              fi
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              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 release-4.2
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@@ -384,7 +384,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "release-4.2"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -398,7 +398,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "release-4.2"
+        branch "master"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -482,12 +482,12 @@ pipeline {
          sh '''#! /bin/bash
             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
             '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:release-4.2"
-          sh "docker push ${IMAGE}:release-4.2"
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
+          sh "docker push ${IMAGE}:latest"
          sh "docker push ${IMAGE}:${META_TAG}"
          sh '''docker rmi \
                ${IMAGE}:${META_TAG} \
-                ${IMAGE}:release-4.2 '''
+                ${IMAGE}:latest '''
                
        }
      }
@@ -517,32 +517,32 @@ pipeline {
                  docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${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-release-4.2"
-          sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-release-4.2"
-          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-release-4.2"
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
+          sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
          sh "docker push ${IMAGE}:amd64-${META_TAG}"
          sh "docker push ${IMAGE}:arm32v6-${META_TAG}"
          sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker push ${IMAGE}:amd64-release-4.2"
-          sh "docker push ${IMAGE}:arm32v6-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}:arm32v6-release-4.2 ${IMAGE}:arm64v8-release-4.2"
-          sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm32v6-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 push ${IMAGE}:amd64-latest"
+          sh "docker push ${IMAGE}:arm32v6-latest"
+          sh "docker push ${IMAGE}:arm64v8-latest"
+          sh "docker manifest push --purge ${IMAGE}:latest || :"
+          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest"
+          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
          sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${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}:release-4.2"
+          sh "docker manifest push --purge ${IMAGE}:latest"
          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
          sh '''docker rmi \
                ${IMAGE}:amd64-${META_TAG} \
-                ${IMAGE}:amd64-release-4.2 \
+                ${IMAGE}:amd64-latest \
                ${IMAGE}:arm32v6-${META_TAG} \
-                ${IMAGE}:arm32v6-release-4.2 \
+                ${IMAGE}:arm32v6-latest \
                ${IMAGE}:arm64v8-${META_TAG} \
-                ${IMAGE}:arm64v8-release-4.2 \
+                ${IMAGE}:arm64v8-latest \
                lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
        }
@@ -551,7 +551,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "release-4.2"
+        branch "master"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
        }
@@ -563,17 +563,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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to release-4.2",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\
             "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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "release-4.2",\
+                     "target_commitish": "master",\
                     "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": true}' >> releasebody.json
+              printf '","draft": false,"prerelease": false}' >> 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'''
      }
--- a/README.md
+++ b/README.md
@@ -246,6 +246,7 @@ Below are the instructions for updating containers:

 ## Versions

+* **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.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,11 +3,11 @@
 # jenkins variables
 project_name: docker-tvheadend
 external_type: github_commit
-release_type: prerelease
-release_tag: release-4.2
-ls_branch: release-4.2
+release_type: stable
+release_tag: latest
+ls_branch: master
 repo_vars:
-  - EXT_GIT_BRANCH = 'release/4.2'
+  - EXT_GIT_BRANCH = 'master'
  - EXT_USER = 'tvheadend'
  - EXT_REPO = 'tvheadend'
  - BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -29,8 +29,8 @@ bsd-compat-headers bsd-compat-headers-0.7.1-r0
 bzip2 bzip2-1.0.6-r6
 nghttp2-libs nghttp2-libs-1.32.0-r0
 libssh2 libssh2-1.8.0-r3
-libcurl libcurl-7.61.1-r2
-curl curl-7.61.1-r2
+libcurl libcurl-7.61.1-r1
+curl curl-7.61.1-r1
 sdl2 sdl2-2.0.8-r1
 libxau libxau-1.0.8-r2
 libbsd libbsd-0.8.6-r2
@@ -76,14 +76,16 @@ ffmpeg-libs ffmpeg-libs-3.4.4-r1
 ffmpeg ffmpeg-3.4.4-r1
 gzip gzip-1.9-r0
 libcrypto1.0 libcrypto1.0-1.0.2r-r0
+libdvbcsa libdvbcsa-1.1.0-r1
 libhdhomerun-libs libhdhomerun-libs-20161117-r1
-libressl libressl-2.7.5-r0
 libssl1.0 libssl1.0-1.0.2r-r0
+libva-intel-driver libva-intel-driver-2.1.0-r0
 libxml2 libxml2-2.9.8-r1
 libgpg-error libgpg-error-1.30-r0
 libgcrypt libgcrypt-1.8.3-r0
 libxslt libxslt-1.1.32-r0
 linux-headers linux-headers-4.4.6-r2
+openssl openssl-1.0.2r-r0
 pcre2 pcre2-10.31-r0
 perl perl-5.26.3-r0
 perl-archive-zip perl-archive-zip-1.60-r0
@@ -185,6 +187,7 @@ perl-http-negotiate perl-http-negotiate-6.01-r1
 perl-libwww perl-libwww-6.34-r0
 perl-lingua-en-numbers-ordinate perl-lingua-en-numbers-ordinate-1.04-r1
 perl-lingua-preferred perl-lingua-preferred-0.2.4-r1
+perl-lwp-useragent-determined perl-lwp-useragent-determined-1.07-r0
 perl-module-build perl-module-build-0.4224-r0
 perl-parse-recdescent perl-parse-recdescent-1.967015-r1
 perl-path-class perl-path-class-0.37-r0
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -125,6 +125,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { 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." }
--- a/root/defaults/config
+++ b/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
 }
--- a/root/etc/services.d/tvheadend/run
+++ b/root/etc/services.d/tvheadend/run
Author	SHA1	Message	Date
LinuxServer-CI	a2f49bb75b	Bot Updating Package Versions	2019-03-01 22:19:05 +00:00
LinuxServer-CI	3659c4708a	Bot Updating Templated Files	2019-03-01 16:35:30 -05:00
aptalca	8387285750	Merge pull request #117 from danofun/master add perl-lwp-useragent-determined which is needed for tv_grab_zz_sdjson_sqlite	2019-03-01 16:34:31 -05:00
LinuxServer-CI	90d21b6f06	Bot Updating Templated Files	2019-03-01 16:16:43 -05:00
danofun	2631706f5b	add changelog entry as requested.	2019-02-28 09:34:40 -05:00
danofun	f6e2be9d51	add perl-lwp-useragent	2019-02-27 21:21:15 -05:00
LinuxServer-CI	e6bb2a1641	Bot Updating Package Versions	2019-02-27 19:26:21 -05:00
LinuxServer-CI	a702166af3	Bot Updating Templated Files	2019-02-27 21:16:49 +00:00
saarg	9dceb0a4ce	Merge pull request #113 from thelamer/master switching back to clone and checkout	2019-02-17 22:54:51 +01:00
thelamer	22ed8475c7	bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge	2019-02-17 12:45:28 -08:00
thelamer	c7ce0c4832	switching back to clone and checkout	2019-02-17 10:38:54 -08:00
saarg	822dbde249	Merge pull request #110 from thelamer/master Fixes for picons	2019-02-16 21:29:10 +01:00
thelamer	cd3964e06c	making requested changes to default config	2019-02-16 09:22:18 -08:00
thelamer	70f300d86a	forgot schema value	2019-02-15 13:03:48 -08:00
thelamer	25979ad455	fixing paths for initial config	2019-02-15 12:57:46 -08:00
thelamer	1306f8cf2d	need to untar picons for htem to be read by the app	2019-02-15 11:44:23 -08:00
thelamer	f19ad9ca20	updating changelog	2019-02-14 22:21:30 -08:00
thelamer	c0a37a6b8b	adding picons path to config if this is a first boot	2019-02-14 22:15:47 -08:00
j0nnymoe	dca4b0ed9b	Merge pull request #107 from thelamer/master adding dynamic readme	2019-02-12 14:34:48 +00:00
thelamer	8768cdb702	adding dynamic readme	2019-02-11 21:06:36 -08:00
LinuxServer-CI	002dda3027	Bot Updating Package Versions	2019-02-11 20:42:30 +00:00
LinuxServer-CI	3122624bf0	Bot Updating Templated Files	2019-02-11 19:24:31 +00:00
aptalca	0f717f40e4	Merge pull request #103 from linuxserver/pipeline Remove Picons pipeline logic and multi arch	2019-02-11 14:23:46 -05:00
thelamer	548d5b2946	pulling picons from object storage during the build	2019-01-17 21:19:52 -08:00
thelamer	ef8f4a0dd0	removing picicons as they are included in the source repo and removing libva from arm variants	2019-01-16 16:14:39 -08:00
thelamer	a99f76a006	adding pipeline logic and multi arching	2019-01-16 01:51:19 -08:00
Homer	6e0fc5e84c	Merge pull request #99 from iaselk/curlpipeperl Add https for curl \| perl used for cpanminus	2018-11-19 12:51:19 +00:00
axuttaja	417a24d0c2	add https for curl \| perl used for cpanminus	2018-10-18 01:56:28 +03:00
aptalca	eb7c4bbefa	Merge pull request #94 from linuxserver/rebase_alpine_3.8 rebase to alpine 3.8 and use buildstage type build	2018-09-12 15:30:34 -04:00
sparklyballs	c2250aa33f	rebase to alpine 3.8	2018-09-12 15:48:43 +01:00
sparklyballs	80fea09e66	Update Dockerfile	2018-09-03 11:48:48 +01:00
sparklyballs	bd7ef42e33	rebase to alpine 3.8 and use buildstage type build	2018-09-02 13:33:35 +01:00
sparklyballs	c92cf86b86	rebase to alpine 3.8 and use buildstage type build	2018-09-02 13:33:03 +01:00
saarg	01c0439c90	Merge pull request #84 from linuxserver/xmltv Add JSON::XS Perl package for grab_tv_huro	2018-04-21 21:00:12 +02:00
tobbenb	17ff5fcca4	Add JSON::XS Perl package for grab_tv_huro	2018-04-21 16:39:02 +02:00
saarg	0ddbdd0c08	Merge pull request #82 from linuxserver/dvbcsa Add dvbcsa package	2018-03-24 11:17:24 +01:00
tobbenb	df6da18c15	Add dvbcsa package	2018-03-24 10:56:39 +01:00
sparklyballs	83f2893d22	Merge pull request #78 from linuxserver/use_sourceforge_master_xmltv use sourceforge master rather than mirror for xmltv	2018-03-04 11:25:49 +00:00
sparklyballs	b41cde8174	copy pasta error	2018-03-04 09:31:38 +00:00
sparklyballs	a306c49d7a	use sourceforge master rather than mirror for xmltv	2018-03-04 09:21:56 +00:00
sparklyballs	4af60c604c	Merge pull request #77 from linuxserver/libva Add lost libva-intel-driver	2018-02-23 13:06:49 +00:00
tobbenb	4288628824	Add lost libva-intel-driver	2018-02-22 22:01:17 +01:00
saarg	5d372c0e19	Merge pull request #74 from linuxserver/iconv Fix wrong version of Iconv used.	2018-02-21 23:41:05 +01:00
tobbenb	6746a3fbf6	Update README and remove old patch file	2018-02-21 21:45:02 +01:00
tobbenb	0f99b9a0d5	Remove --cflags option left from testing	2018-02-21 19:02:37 +01:00
tobbenb	aa9724fdc2	Fix iconv runtime crash	2018-02-21 19:00:51 +01:00
sparklyballs	de493babb9	Update README.md	2018-02-18 21:21:40 +00:00
sparklyballs	0321b4d01a	Merge pull request #73 from CvH/vaapi-support Vaapi support	2018-02-18 21:12:07 +00:00
cvh	c0fe17d93e	add vaapi to readme	2018-02-18 21:23:56 +01:00
cvh	b1a069a702	remove dvb-apps dependency - Tvh ships now an own implementation	2018-02-18 21:23:54 +01:00
cvh	a68b5c32a4	add some build options - disable-avahi to prevent error at buildlog - disable-dbus_1 to prevent error at buildlog - disable-bintray_cache to prevent known problems with that cache - enable-trace to allow the usage of advanced debug functions (this is a devel branch)	2018-02-18 21:23:53 +01:00
cvh	880d45e6fe	add png compression - all pics at the help get compressed without viewable quality loss	2018-02-18 21:23:51 +01:00
cvh	a6a8e1b6d4	add vaapi support	2018-02-18 21:23:50 +01:00
sparklyballs	4d7daed6fc	Merge pull request #67 from linuxserver/deprecate_cpu_core deprecate cpu_core routine lack of scaling	2018-01-04 20:45:13 +00:00
sparklyballs	c15493ddbe	deprecate cpu_core routine lack of scaling	2018-01-04 11:59:40 +00:00
sparklyballs	3dbea6d9a5	Merge pull request #63 from linuxserver/3.7 bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 13:52:46 +00:00
sparklyballs	d18eb4297c	Update Dockerfile	2017-12-11 11:36:34 +00:00
sparklyballs	53ba6baa56	bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 11:19:37 +00:00
sparklyballs	0d9c4b8394	bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 11:16:09 +00:00
aptalca	3a054b8a57	Merge pull request #62 from linuxserver/x264_fix add codec dependencies	2017-09-01 21:23:11 -04:00
sparklyballs	6d486e90d0	add codec dependencies	2017-09-02 00:16:44 +01:00
aptalca	4aeef6554b	Merge pull request #60 from linuxserver/config_patches increased uniformity across all archs	2017-07-13 20:27:40 -04:00
sparklyballs	2e0e6d028c	increased uniformity across all archs	2017-07-13 20:17:36 +01:00
sparklyballs	d4fb416e62	correct label tags	2017-07-12 15:51:58 +01:00
sparklyballs	51f45f4d30	update of README with badges for new ci	2017-07-11 09:36:12 +01:00
sparklyballs	6a4d853235	Merge pull request #58 from linuxserver/readme-master Update README with full path for comskip	2017-07-09 12:25:44 +01:00
tobbenb	0b1069a088	Update README with full path for comskip	2017-07-08 12:26:54 +02:00
sparklyballs	c9181d7131	Update README.md	2017-07-03 12:22:17 +01:00
j0nnymoe	9a3b13ad27	Merge pull request #56 from linuxserver/readme Update README with new branch	2017-07-03 12:15:49 +01:00
sparklyballs	bdc1f87ac6	tidy up dockerfile edit README with changes to release branch	2017-07-03 12:05:15 +01:00
sparklyballs	e4e07121af	tidy up Dockerfile and use only one install run for runtime packages	2017-07-03 11:34:18 +01:00
sparklyballs	0e8ea6063c	change branch for release 4.2	2017-07-02 16:03:09 +01:00
tobbenb	9b161c87f9	Update README with new branch	2017-07-02 16:50:26 +02:00
saarg	ec6ff1a886	Merge pull request #54 from linuxserver/alpine_3.6 bump to alpine 3.6	2017-05-28 16:12:13 +02:00
sparklyballs	87d4b9c811	remove unneeded ffmpeg variable	2017-05-28 02:34:06 +01:00
sparklyballs	0d53fe87a0	add pcre2 dependency	2017-05-27 23:52:54 +01:00
sparklyballs	314f59a89f	bump to alpine 3.6	2017-05-27 23:37:20 +01:00
j0nnymoe	4e44306b81	Merge pull request #53 from linuxserver/README_edits "placeholder" image to fix broken link, add missing image version info	2017-05-11 10:46:09 +01:00
sparklyballs	68a5beb2ce	"placeholder" image to fix broken link, add missing image version info	2017-05-11 07:43:55 +01:00
j0nnymoe	9ce7af875d	Merge pull request #52 from linuxserver/fix_duplicates_dockerfile fix duplicates in Dockerfile, some spacing issues	2017-05-09 15:58:20 +01:00
sparklyballs	51e21fbae9	fix duplicates in Dockerfile, some spacing issues	2017-05-09 11:48:56 +01:00
sparklyballs	97ed2af733	use readme from 4.2.1 branch	2017-05-01 14:01:38 +01:00