Bot Updating Package Versions

Bot Updating Templated Files
2019-10-20 18:39:50 -04:00 · 2019-10-20 17:57:43 -04:00 · 2019-10-20 22:56:20 +01:00 · 2019-10-20 22:55:00 +01:00 · 2019-10-20 14:00:11 -07:00 · 2019-10-02 18:05:34 -04:00
18 changed files with 452 additions and 839 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,122 +0,0 @@
-# Contributing to tvheadend
-
-## Gotchas
-
-* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
-* Read, and fill the Pull Request template
-  * If this is a fix for a typo in code or documentation in the README please file an issue
-  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
-
-## Common files
-
-| File | Use case |
-| :----: | --- |
-| `Dockerfile` | Dockerfile used to build amd64 images |
-| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures |
-| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures |
-| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image |
-| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process |
-| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions |
-| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries |
-| `readme-vars.yml` | This file is used to generate the `README.md` |
-
-## Readme
-
-If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-tvheadend/edit/master/readme-vars.yml).
-
-These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
-Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-tvheadend)
-
-### Fixing typos or clarify the text in the readme
-
-There are variables for multiple parts of the readme, the most common ones are:
-
-| Variable | Description |
-| :----: | --- |
-| `project_blurb` | This is the short excerpt shown above the project logo. |
-| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled |
-
-### Parameters
-
-The compose and run examples are also generated from these variables.
-
-We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder.
-
-These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`.
-Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file.
-
-Devices, environment variables, ports and volumes expects its variables in a certain way.
-
-### Devices
-
-```yml
-param_devices:
-  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
-opt_param_devices:
-  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
-```
-
-### Environment variables
-
-```yml
-param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
-opt_param_env_vars:
-  - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." }
-```
-
-### Ports
-
-```yml
-param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
-opt_param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
-```
-
-### Volumes
-
-```yml
-param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
-opt_param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
-```
-
-### Testing template changes
-
-After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
-
-## Dockerfiles
-
-We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work.
-If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order.
-
-### Testing your changes
-
-```
-git clone https://github.com/linuxserver/docker-tvheadend.git
-cd docker-tvheadend
-docker build \
-  --no-cache \
-  --pull \
-  -t linuxserver/tvheadend:latest .
-```
-
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
-```
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
-```
-
-Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
-
-## Update the chagelog
-
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-tvheadend/tree/master/root), add an entry to the changelog
-
-```yml
-changelogs:
-  - { date: "DD.MM.YY:", desc: "Added some love to templates" }
-```
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
-github: linuxserver
 open_collective: linuxserver
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,10 +1,7 @@
 [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. --->
-
-<!--- If this acts as a feature request please 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/ -->
+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 -->

@@ -25,10 +22,9 @@
 4.

 ## Environment
-**OS:**
-**CPU architecture:** x86_64/arm32/arm64
-**How docker service was installed:**
-<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
+**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 -->

 ## Command used to create docker container (run/create/compose/screenshot)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,11 +2,11 @@

 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
+	

 <!--- 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  -->
+<!---  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 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 -->
@@ -21,11 +21,7 @@

 ------------------------------

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-tvheadend/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
-
------------------------------
-
-<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
+We welcome all PR’s though this doesn’t guarantee it will be accepted.

 ## Description:
 <!--- Describe your changes in detail -->
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -1,13 +0,0 @@
-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/blob/master/.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/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,23 +0,0 @@
-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/82
+++ b/82
@@ -1,13 +1,14 @@
-FROM lsiobase/alpine:3.12 as buildstage
+FROM lsiobase/alpine:3.10 as buildstage
 ############## build stage ##############

 # 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
@@ -29,21 +30,18 @@ RUN \
 	gcc \
 	gettext-dev \
 	git \
-	gnu-libiconv-dev \
 	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 \
@@ -75,12 +73,10 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
-	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -103,14 +99,17 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python2 \
+	python \
 	sdl-dev \
 	tar \
 	uriparser-dev \
 	wget \
 	x264-dev \
 	x265-dev \
-	zlib-dev
+	zlib-dev && \
+ apk add --no-cache \
+	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	gnu-libiconv-dev

 RUN \
 echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -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 \
@@ -127,8 +126,6 @@ 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 && \
@@ -142,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 \
@@ -221,7 +215,7 @@ RUN \
 make DESTDIR=/tmp/comskip-build install

 ############## runtime stage ##############
-FROM lsiobase/alpine:3.12
+FROM lsiobase/alpine:3.10

 # set version label
 ARG BUILD_DATE
@@ -240,21 +234,16 @@ RUN \
 	curl \
 	ffmpeg \
 	ffmpeg-libs \
-	gnu-libiconv \
 	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 \
@@ -285,12 +274,10 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
-	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -311,14 +298,16 @@ RUN \
 	perl-xml-treepp \
 	perl-xml-twig \
 	perl-xml-writer \
-	py3-requests \
-	python2 \
+	python \
 	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 \
@@ -328,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/
@@ -336,4 +326,4 @@ COPY root/ /

 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config
+VOLUME /config /recordings
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,13 +1,14 @@
-FROM lsiobase/alpine:arm64v8-3.12 as buildstage
+FROM lsiobase/alpine:arm64v8-3.10 as buildstage
 ############## build stage ##############

 # 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
@@ -29,20 +30,18 @@ RUN \
 	gcc \
 	gettext-dev \
 	git \
-	gnu-libiconv-dev \
 	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 \
@@ -74,12 +73,10 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
-	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -102,14 +99,17 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python2 \
+	python \
 	sdl-dev \
 	tar \
 	uriparser-dev \
 	wget \
 	x264-dev \
 	x265-dev \
-	zlib-dev	
+	zlib-dev && \
+ apk add --no-cache \
+	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	gnu-libiconv-dev

 RUN \
 echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -118,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 \
@@ -126,8 +126,6 @@ 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 && \
@@ -141,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 && \
@@ -153,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 \
@@ -219,7 +215,7 @@ RUN \
 make DESTDIR=/tmp/comskip-build install

 ############## runtime stage ##############
-FROM lsiobase/alpine:arm64v8-3.12
+FROM lsiobase/alpine:arm64v8-3.10

 # set version label
 ARG BUILD_DATE
@@ -238,18 +234,16 @@ RUN \
 	curl \
 	ffmpeg \
 	ffmpeg-libs \
-	gnu-libiconv \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -280,12 +274,10 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
-	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -306,14 +298,16 @@ RUN \
 	perl-xml-treepp \
 	perl-xml-twig \
 	perl-xml-writer \
-	py3-requests \
-	python2 \
+	python \
 	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 \
@@ -323,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/
@@ -331,4 +326,4 @@ COPY root/ /

 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config
+VOLUME /config /recordings
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,13 +1,14 @@
-FROM lsiobase/alpine:arm32v7-3.12 as buildstage
+FROM lsiobase/alpine:arm32v7-3.10 as buildstage
 ############## build stage ##############

 # 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
@@ -29,20 +30,18 @@ RUN \
 	gcc \
 	gettext-dev \
 	git \
-	gnu-libiconv-dev \
 	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 \
@@ -74,12 +73,10 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
-	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -102,14 +99,17 @@ RUN \
 	perl-xml-writer \
 	pkgconf \
 	pngquant \
-	python2 \
+	python \
 	sdl-dev \
 	tar \
 	uriparser-dev \
 	wget \
 	x264-dev \
 	x265-dev \
-	zlib-dev
+	zlib-dev && \
+ apk add --no-cache \
+	--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
+	gnu-libiconv-dev

 RUN \
 echo "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
@@ -118,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 \
@@ -126,8 +126,6 @@ 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 && \
@@ -141,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 && \
@@ -153,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 \
@@ -219,7 +215,7 @@ RUN \
 make DESTDIR=/tmp/comskip-build install

 ############## runtime stage ##############
-FROM lsiobase/alpine:arm32v7-3.12
+FROM lsiobase/alpine:arm32v7-3.10

 # set version label
 ARG BUILD_DATE
@@ -238,18 +234,16 @@ RUN \
 	curl \
 	ffmpeg \
 	ffmpeg-libs \
-	gnu-libiconv \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -280,12 +274,10 @@ RUN \
 	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
-	perl-json-xs \
 	perl-libwww \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -306,14 +298,16 @@ RUN \
 	perl-xml-treepp \
 	perl-xml-twig \
 	perl-xml-writer \
-	py3-requests \
-	python2 \
+	python \
 	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 \
@@ -323,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/
@@ -331,4 +326,4 @@ COPY root/ /

 # ports and volumes
 EXPOSE 9981 9982
-VOLUME /config
+VOLUME /config /recordings
--- a/241
+++ b/241
@@ -14,9 +14,7 @@ pipeline {
  environment {
    BUILDS_DISCORD=credentials('build_webhook_url')
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
-    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
-    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    EXT_GIT_BRANCH = 'master'
+    EXT_GIT_BRANCH = 'release/4.2'
    EXT_USER = 'tvheadend'
    EXT_REPO = 'tvheadend'
    BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
@@ -44,7 +42,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' ''',
@@ -58,7 +56,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/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@@ -129,45 +127,39 @@ 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 {
        script{
          env.IMAGE = env.DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
-          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // 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 {
        script{
          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
-          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -180,15 +172,12 @@ pipeline {
      steps {
        script{
          env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
-          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          } else {
            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          }
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
        }
@@ -226,7 +215,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
@@ -237,7 +226,7 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=release-4.2 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -245,9 +234,9 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f release-4.2
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
                cd ${TEMPDIR}/repo/${LS_REPO}/
                git add ${TEMPLATED_FILES}
@@ -277,7 +266,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 {
@@ -290,26 +279,6 @@ pipeline {
        }
      }
    }
-    /* #######################
-           GitLab Mirroring
-       ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
-    stage("GitLab Mirror"){
-      when {
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
-             "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
-      } 
-    }
    /* ###############
       Build Container
       ############### */
@@ -357,9 +326,7 @@ 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}"
-              retry(5) {
-                sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              }
+              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
              sh '''docker rmi \
                    ${IMAGE}:arm32v7-${META_TAG} \
                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -386,9 +353,7 @@ 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}"
-              retry(5) {
-                sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              }
+              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
              sh '''docker rmi \
                    ${IMAGE}:arm64v8-${META_TAG} \
                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -400,7 +365,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: ''
      }
@@ -428,7 +393,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
@@ -452,7 +417,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: ''
@@ -466,7 +431,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: ''
@@ -547,30 +512,17 @@ pipeline {
            passwordVariable: 'DOCKERPASS'
          ]
        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
-                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker push ${PUSHIMAGE}:latest
-                    docker push ${PUSHIMAGE}:${META_TAG}
-                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                  done
-               '''
-          }
+          echo 'Logging into DockerHub'
          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                done
+             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 push ${IMAGE}:${META_TAG}"
+          sh '''docker rmi \
+                ${IMAGE}:${META_TAG} \
+                ${IMAGE}:release-4.2 || :'''
+                
        }
      }
    }
@@ -589,97 +541,51 @@ pipeline {
            passwordVariable: 'DOCKERPASS'
          ]
        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  if [ "${CI}" == "false" ]; then
-                    docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                    docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                  fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
-                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    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 push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    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 create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_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 tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG}
-                  docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG}
-                  docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG}
-                  docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                  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
-                  docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG}
-                  docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG}
-                  docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG}
-                  docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-               '''
-          }
          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest || :
-                done
-                docker rmi \
-                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
             '''
+          sh '''#! /bin/bash
+                if [ "${CI}" == "false" ]; then
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                fi'''
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-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-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}:release-4.2"
+          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
+          sh '''docker rmi \
+                ${IMAGE}:amd64-${META_TAG} \
+                ${IMAGE}:amd64-release-4.2 \
+                ${IMAGE}:arm32v7-${META_TAG} \
+                ${IMAGE}:arm32v7-release-4.2 \
+                ${IMAGE}:arm64v8-${META_TAG} \
+                ${IMAGE}:arm64v8-release-4.2 \
+                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
        }
      }
    }
    // 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
        }
@@ -691,17 +597,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'''
      }
@@ -722,10 +628,6 @@ 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="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
                docker pull lsiodev/readme-sync
                docker run --rm=true \
                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
@@ -733,9 +635,7 @@ pipeline {
                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
                  -e DOCKER_REPOSITORY=${IMAGE} \
                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  lsiodev/readme-sync bash -c 'node sync' 
-                rm -Rf ${TEMPDIR} '''
+                  lsiodev/readme-sync bash -c 'node sync' '''
        }
      }
    }
@@ -762,19 +662,16 @@ pipeline {
          sh 'echo "build aborted"'
        }
        else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
      }
    }
-    cleanup {
-      cleanWs()
-    }
  }
 }
--- a/README.md
+++ b/README.md
@@ -1,16 +1,13 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the CONTRIBUTING.md -->
-
 [![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?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")
+[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
+[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")

-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)
@@ -23,20 +20,17 @@ Find us at:
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
-* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
+* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
 * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget

 # [linuxserver/tvheadend](https://github.com/linuxserver/docker-tvheadend)
-
-[![GitHub 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)
+[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-tvheadend.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-tvheadend/releases)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
+[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend)
+[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/tvheadend)
+[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
+[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/tvheadend/latest/index.html)

 [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.
@@ -74,13 +68,37 @@ This image provides various versions that are available via tags. `latest` tag u

 Here are some example snippets to help you get started creating a container.

-### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
+### docker
+
+```
+docker create \
+  --name=tvheadend \
+  -e PUID=1000 \
+  -e PGID=1000 \
+  -e TZ=Europe/London \
+  -e RUN_OPTS=<run options here> `#optional` \
+  -p 9981:9981 \
+  -p 9982:9982 \
+  -v <path to data>:/config \
+  -v <path to recordings>:/recordings \
+  --device /dev/dri:/dev/dri `#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 of a limitation in docker and multicast.
+
+
+### docker-compose

 Compatible with docker-compose v2 schemas.

-```yaml
+```
 ---
-version: "2.1"
+version: "2"
 services:
  tvheadend:
    image: linuxserver/tvheadend
@@ -98,35 +116,10 @@ services:
      - 9982:9982
    devices:
      - /dev/dri:/dev/dri #optional
-      - /dev/dvb:/dev/dvb #optional
+      - /dev/drb:/dev/dvb #optional
    restart: unless-stopped
 ```

-### docker cli
-
-```
-docker run -d \
-  --name=tvheadend \
-  -e PUID=1000 \
-  -e PGID=1000 \
-  -e TZ=Europe/London \
-  -e RUN_OPTS=<run options here> `#optional` \
-  -p 9981:9981 \
-  -p 9982:9982 \
-  -v <path to data>:/config \
-  -v <path to recordings>:/recordings \
-  --device /dev/dri:/dev/dri `#optional` \
-  --device /dev/dvb:/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.
-
-
 ## Parameters

 Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
@@ -144,23 +137,6 @@ Container images are configured using parameters passed at runtime (such as thos
 | `--device /dev/dri` | Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi). |
 | `--device /dev/dvb` | Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out. |

-## Environment variables from files (Docker secrets)
-
-You can set any environment variable from a file by using a special prepend `FILE__`.
-
-As an example:
-
-```
-e FILE__PASSWORD=/run/secrets/mysecretpassword
-```
-
-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
-
-## Umask for running applications
-
-For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
-Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
-
 ## User / Group Identifiers

 When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -229,7 +205,7 @@ For advanced setup of tvheadend, go to [Tvheadend][appurl]

 **Picons**

-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.
+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.
 You need to enable minimum advanced view level to see the picons options.

 ## Additional runtime parameters
@@ -237,11 +213,6 @@ 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=tvheadend&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.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
-
-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) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
-

 ## Support Info

@@ -258,6 +229,14 @@ Most of our images are static, versioned, and require an image update and contai

 Below are the instructions for updating containers:

+### Via Docker Run/Create
+* Update the image: `docker pull linuxserver/tvheadend`
+* Stop the running container: `docker stop tvheadend`
+* Delete the container: `docker rm tvheadend`
+* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
+* Start the new container: `docker start tvheadend`
+* You can also remove the old dangling images: `docker image prune`
+
 ### Via Docker Compose
 * Update all images: `docker-compose pull`
  * or update a single image: `docker-compose pull tvheadend`
@@ -265,14 +244,7 @@ Below are the instructions for updating containers:
  * or update a single container: `docker-compose up -d tvheadend`
 * You can also remove the old dangling images: `docker image prune`

-### Via Docker Run
-* Update the image: `docker pull linuxserver/tvheadend`
-* Stop the running container: `docker stop tvheadend`
-* Delete the container: `docker rm tvheadend`
-* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
-
-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
+### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
 * Pull the latest image at its tag and replace it with the same env variables in one run:
  ```
  docker run --rm \
@@ -280,13 +252,11 @@ Below are the instructions for updating containers:
  containrrr/watchtower \
  --run-once tvheadend
  ```
+
+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
+
 * You can also remove the old dangling images: `docker image prune`

-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
-
-### Image Update Notifications - Diun (Docker Image Update Notifier)
-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
-
 ## Building locally

 If you want to make local modifications to these images for development purposes or just to customize the logic:
@@ -308,17 +278,11 @@ 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.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.
--- a/jenkins-vars.yml
+++ b/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'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,255 +1,220 @@
-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.9-r1
-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
+alpine-baselayout-3.1.2-r0
+alpine-keys-2.1-r2
+alsa-lib-1.1.9-r0
+apk-tools-2.10.4-r2
+bash-5.0.0-r0
+bsd-compat-headers-0.7.1-r0
+busybox-1.30.1-r2
+bzip2-1.0.6-r7
+ca-certificates-20190108-r0
+ca-certificates-cacert-20190108-r0
+coreutils-8.31-r0
+curl-7.66.0-r0
+expat-2.2.8-r0
+ffmpeg-4.1.4-r0
+ffmpeg-libs-4.1.4-r0
+fontconfig-2.13.1-r0
+freetype-2.10.0-r0
+fribidi-1.0.5-r1
 gdbm-1.13-r1
-gmp-6.2.0-r0
+gmp-6.1.2-r1
 gnu-libiconv-1.15-r2
-gnutls-3.6.15-r0
+gnutls-3.6.8-r0
 gzip-1.10-r0
 lame-3.100-r0
-libacl-2.2.53-r0
+libacl-2.2.52-r6
 libass-0.14.0-r0
 libattr-2.4.48-r0
-libbsd-0.10.0-r0
-libbz2-1.0.8-r1
-libc-utils-0.7.2-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
-libelf-0.179-r0
-libffi-3.3-r2
-libgcc-9.3.0-r2
+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
+libffi-3.2.1-r6
+libgcc-8.3.0-r0
 libgcrypt-1.8.5-r0
-libgpg-error-1.37-r0
-libhdhomerun-libs-20200225-r0
+libgpg-error-1.36-r2
+libhdhomerun-libs-20161117-r1
 libidn-1.35-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
+libjpeg-turbo-2.0.2-r0
+libogg-1.3.3-r2
+libpciaccess-0.14-r0
 libpng-1.6.37-r1
-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
+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
 libtheora-1.1.1-r14
-libtls-standalone-2.9.1-r1
+libtls-standalone-2.9.1-r0
 libunistring-0.9.10-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
+liburiparser-0.9.3-r0
+libuuid-2.33.2-r0
+libva-2.4.1-r0
+libvdpau-1.2-r0
 libvorbis-1.3.6-r2
-libvpx-1.8.2-r0
-libx11-1.6.12-r0
+libvpx-1.8.0-r0
+libx11-1.6.8-r1
 libxau-1.0.9-r0
-libxcb-1.14-r1
+libxcb-1.13.1-r0
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-5.0.3-r2
-libxml2-2.9.10-r5
-libxshmfence-1.3-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
+libxml2-2.9.9-r2
+libxslt-1.1.33-r1
+linux-headers-4.19.36-r0
+linux-pam-1.3.0-r1
+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
 opus-1.3.1-r0
-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
+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
 perl-importer-0.025-r0
-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-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-list-moreutils-0.428-r0
-perl-list-moreutils-xs-0.428-r3
+perl-list-moreutils-xs-0.428-r1
 perl-lwp-mediatypes-6.04-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-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-net-http-6.19-r0
-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-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-try-tiny-0.30-r1
-perl-types-serialiser-1.0-r2
-perl-unicode-string-2.10-r1
+perl-unicode-string-2.09-r7
 perl-uri-1.76-r0
-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
+perl-variable-magic-0.62-r1
+perl-www-robotrules-6.02-r1
+perl-xml-libxml-2.0134-r2
+perl-xml-libxslt-1.96-r1
+perl-xml-namespacesupport-1.12-r0
+perl-xml-parser-2.44-r5
+perl-xml-sax-0.99-r2
+perl-xml-sax-base-1.09-r0
+perl-xml-treepp-0.43-r1
+perl-xml-twig-3.52-r1
+perl-xml-writer-0.625-r2
+perl-yaml-syck-1.31-r1
+python2-2.7.16-r1
+readline-8.0.0-r0
+scanelf-1.2.3-r0
+sdl2-2.0.10-r0
+shadow-4.6-r2
+sqlite-libs-3.28.0-r1
+ssl_client-1.30.1-r2
+tar-1.32-r0
+tzdata-2019c-r0
+uriparser-0.9.3-r0
+v4l-utils-libs-1.16.6-r0
+wayland-libs-client-1.17.0-r0
+wget-1.20.3-r0
+x264-20180304-r1
+x264-libs-20180304-r1
+x265-3.0-r0
+x265-libs-3.0-r0
+xvidcore-1.3.4-r1
+xz-5.2.4-r0
+xz-libs-5.2.4-r0
+zlib-1.2.11-r1
--- a/patches/cpanfile
+++ b/patches/cpanfile
@@ -11,6 +11,7 @@ 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
@@ -1,20 +0,0 @@
---
- 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
@@ -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
@@ -117,7 +116,7 @@ app_setup_block: |

  **Picons**

-  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.
+  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.
  You need to enable minimum advanced view level to see the picons options.

  ## Additional runtime parameters
@@ -126,17 +125,11 @@ 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.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." }
--- 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	add0f71bb5	Bot Updating Package Versions	2019-10-20 18:39:50 -04:00
LinuxServer-CI	f361044cd9	Bot Updating Templated Files	2019-10-20 17:57:43 -04:00
LinuxServer-CI	dbc64ffec6	Bot Updating Templated Files	2019-10-20 22:56:20 +01:00
chbmb	2ace13ff57	Merge pull request #148 from thelamer/release-4.2 bugfix for alpine	2019-10-20 22:55:00 +01:00
thelamer	e9bcbed67d	bugfix for alpine	2019-10-20 14:00:11 -07:00
LinuxServer-CI	c2d877e27c	Bot Updating Package Versions	2019-10-02 18:05:34 -04:00
LinuxServer-CI	d9d6268f24	Bot Updating Templated Files	2019-10-02 17:12:00 -04:00
LinuxServer-CI	59907cf1df	Bot Updating Templated Files	2019-10-02 17:10:52 -04:00
aptalca	cc7c79eb44	Improve permission fixing on render & dvb devices	2019-10-02 17:09:42 -04:00
LinuxServer-CI	1bb93b5a30	Bot Updating Package Versions	2019-08-02 15:18:17 -04:00
aptalca	5615df900e	fix video device permissions	2019-08-02 11:09:06 -07:00
LinuxServer-CI	f7af259238	Bot Updating Package Versions	2019-06-30 22:09:01 +00:00
LinuxServer-CI	bf90cea801	Bot Updating Templated Files	2019-06-30 20:21:43 +01:00
chbmb	ebcc0518bf	Merge pull request #135 from linuxserver/release-4.2-3.10 Rebasing to Alpine 3.10	2019-06-30 20:20:39 +01:00
thelamer	7cf6a4290e	Rebasing to Alpine 3.10	2019-06-28 19:08:29 -07:00
LinuxServer-CI	e052b086ce	Bot Updating Package Versions	2019-06-13 19:23:28 -04:00
LinuxServer-CI	118f21be42	Bot Updating Templated Files	2019-06-12 18:36:45 -04:00
LinuxServer-CI	0f8ca85398	Bot Updating Templated Files	2019-06-12 23:35:45 +01:00
Ryan Kuba	e7ffd7fb7f	Extract Picons on boot Release-4.2 (#128 ) * reworking logic to untar on first boot and reducing sample size for chown logic as it is not recursive * bad path in arm variants	2019-03-28 17:18:44 +01:00
LinuxServer-CI	6eb29390f0	Bot Updating Package Versions	2019-03-28 07:53:07 +00:00
Ryan Kuba	c064466ce4	#72 fix chowning Release 4.2 (#126 ) * making mods for release-4.2 branch * typo	2019-03-28 08:03:35 +01:00
LinuxServer-CI	b6a321aee6	Bot Updating Package Versions	2019-03-25 02:02:20 +01:00
Ryan Kuba	3d34a9cf03	Merge pull request #124 from thelamer/release-4.2 Switching to new Base images, shift to arm32v7 tag.	2019-03-24 17:10:13 -07:00
thelamer	e0a76e29e2	Switching to new Base images, shift to arm32v7 tag.	2019-03-23 22:18:13 -07:00
LinuxServer-CI	13f64cbc4b	Bot Updating Package Versions	2019-03-22 00:31:34 +00:00
LinuxServer-CI	2c696d51b0	Bot Updating Package Versions	2019-03-07 19:02:51 -05:00
LinuxServer-CI	780b22728e	Bot Updating Templated Files	2019-03-07 18:14:52 -05:00
aptalca	9417e1f9c4	Merge pull request #121 from thelamer/release-4.2 libiconv shifted to community repos- release 4.2	2019-03-07 18:14:02 -05:00
thelamer	5fb3338564	libiconv shifted to community repos	2019-03-07 14:12:48 -08:00
LinuxServer-CI	89322d5956	Bot Updating Package Versions	2019-03-02 00:28:07 +00:00
LinuxServer-CI	267e3ef786	Bot Updating Templated Files	2019-03-01 18:35:41 -05:00
saarg	5de6faf27f	Merge pull request #114 from thelamer/release-4.2 switching back to clone and checkout release-4.2	2019-02-17 22:54:37 +01:00
thelamer	dab37e4ecd	bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge	2019-02-17 12:42:34 -08:00
thelamer	6ab17ce8b7	adding jq package for commit parsing on local build	2019-02-17 12:15:38 -08:00
thelamer	81c71ee54d	switching back to clone and checkout	2019-02-17 10:41:49 -08:00
saarg	a5fe08ef84	Merge pull request #111 from thelamer/release-4.2 Fix for picons Release 4.2	2019-02-16 21:33:35 +01:00
thelamer	65b2f3c3c7	making requested changes to default config	2019-02-16 09:23:06 -08:00
thelamer	7d94cc4b64	forgot schema value	2019-02-15 13:03:14 -08:00
thelamer	e834619ec3	fixing paths for initial config	2019-02-15 12:58:34 -08:00
thelamer	ab115449e7	need to untar picons for htem to be read by the app	2019-02-15 11:45:41 -08:00
thelamer	322e35bb00	adding picons path to config if this is a first boot	2019-02-14 22:19:37 -08:00
j0nnymoe	6dfbb30c0a	Merge pull request #108 from thelamer/release-4.2 adding dynamic readme	2019-02-12 14:34:26 +00:00
thelamer	94b0bc34c7	adding dynamic readme	2019-02-11 21:07:25 -08:00
LinuxServer-CI	2c89a24550	Bot Updating Package Versions	2019-02-11 22:20:05 +00:00
LinuxServer-CI	4d2207db61	Bot Updating Templated Files	2019-02-11 21:42:22 +00:00
aptalca	27ac3525fb	Merge pull request #105 from linuxserver/pipeline-4.2 adding multi arch and pipeline logic, pulling picons from object storage	2019-02-11 16:41:43 -05:00
thelamer	946c4fd8a9	adding multi arch and pipeline logic, pulling picons from object storage	2019-01-17 22:46:45 -08:00
aptalca	bf0911b6f5	Merge pull request #95 from linuxserver/release-4.2_rebase_alpine_3.8 rebase to alpine 3.8 and use buildstage type build	2018-09-12 15:31:15 -04:00
sparklyballs	1a9770d227	rebase to alpine 3.8	2018-09-12 15:46:35 +01:00
sparklyballs	c0a3661442	rebase to alpine 3.8 and use buildstage type build	2018-09-03 12:38:00 +01:00
saarg	ba0a26bfb1	Merge pull request #85 from linuxserver/xmltv_4.2 Add JSON::XS Perl package for grab_tv_huro	2018-04-21 21:00:35 +02:00
tobbenb	ac7dc7b478	Add JSON::XS Perl package for grab_tv_huro	2018-04-21 16:41:11 +02:00
sparklyballs	24d94ed4ad	Merge pull request #79 from linuxserver/release-4.2_use_sourceforge_master_xmltv use sourceforge master rather than mirror for xmltv	2018-03-04 11:26:02 +00:00
sparklyballs	fb45df2646	use sourceforge master rather than mirror for xmltv	2018-03-04 09:39:23 +00:00
sparklyballs	57893d0451	Merge pull request #76 from linuxserver/pngquant Add missing pngquant package	2018-02-23 13:06:20 +00:00
tobbenb	692ee67cf4	Add missing pngquant package	2018-02-22 21:57:43 +01:00
saarg	cacfb82b62	Merge pull request #75 from linuxserver/iconv_4.2 Fix wrong version of Iconv and add build options	2018-02-21 23:41:34 +01:00
tobbenb	e3b56a32cc	Remove old libiconv patch	2018-02-21 23:01:55 +01:00
tobbenb	b487342878	Sparklyfi Dockerfile	2018-02-21 21:57:19 +01:00
tobbenb	0a365513dd	Update README	2018-02-21 21:54:23 +01:00
tobbenb	1075ff6c38	Add build options from CvH	2018-02-21 21:52:32 +01:00
tobbenb	76d27bb36d	Fix iconv runtime crash	2018-02-21 21:50:56 +01:00
sparklyballs	2f197666ac	Merge pull request #66 from linuxserver/release-4.2_deprecate_cpu_core deprecate cpu_core routine lack of scaling	2018-01-04 20:45:39 +00:00
sparklyballs	34b9ebf98f	deprecate cpu_core routine lack of scaling	2018-01-04 11:49:17 +00:00
sparklyballs	e1e7730dcc	Merge pull request #64 from linuxserver/release-4.2_3.7 bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 14:44:51 +00:00
sparklyballs	8269eee493	bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 12:42:03 +00:00
sparklyballs	4fa1634986	Update README.md	2017-12-09 00:40:09 +00:00
sparklyballs	5b5dee7f67	dot resolves weird github/jenkins syncing commits	2017-12-02 00:08:48 +00:00
aptalca	56c3b9a524	Merge pull request #61 from linuxserver/release-4.2_config_patches increased uniformity across all archs	2017-07-13 20:28:00 -04:00
sparklyballs	a815f66aa3	increased uniformity across all archs	2017-07-13 20:21:04 +01:00
sparklyballs	bcaaad93e4	update of README with badges for new ci	2017-07-11 09:38:21 +01:00
sparklyballs	1cd1bf3fc5	Merge pull request #59 from linuxserver/readme-release Update README with full path for comskip	2017-07-09 12:25:22 +01:00
tobbenb	b210ad4793	Update README with full path for comskip	2017-07-08 12:28:27 +02:00
sparklyballs	4af4d02187	Merge pull request #57 from linuxserver/dockerfile_tidy tidy up Dockerfile and install runtime packages all in one	2017-07-03 11:12:17 +01:00
sparklyballs	c340938778	tidy up Dockerfile and install runtime packages all in one	2017-07-03 05:42:55 +01:00
tobbenb	cce4adf7e4	Move to one branch for all 4.2 releases	2017-07-02 16:40:53 +02:00
saarg	ee18601f12	Merge pull request #55 from linuxserver/stable-4.2.1_alpine3.6 bump to alpine 3.6	2017-05-28 16:12:22 +02:00
sparklyballs	68cc40f86e	bump to alpine 3.6	2017-05-28 02:29:34 +01:00
sparklyballs	9b1f7b3303	Merge pull request #51 from linuxserver/4.2.1 Update to tvheadend 4.2.1 stable	2017-05-01 13:56:26 +01:00
sparklyballs	01af20a3df	Update README.md	2017-05-01 12:37:09 +01:00
tobbenb	f65d09bea2	Cleaning up after sparklys cut and paste double	2017-05-01 13:17:08 +02:00
tobbenb	aab4fb1b35	Update to tvheadend 4.2.1 stable	2017-05-01 12:55:41 +02:00