Improve permission fixing on render & dvb devices

Bot Updating Package Versions
2019-10-02 17:10:12 -04:00 · 2019-09-26 22:46:14 -04:00 · 2019-09-20 03:36:48 +01:00 · 2019-09-05 22:48:01 -04:00 · 2019-09-06 03:04:00 +01:00 · 2019-09-06 03:03:00 +01:00
7 changed files with 102 additions and 39 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: linuxserver
--- a/1
+++ b/1
@@ -247,6 +247,7 @@ RUN \
 	libssl1.1 \
 	libva \
 	libva-intel-driver \
+	mesa-dri-ati \
 	libvpx \
 	libxml2 \
 	libxslt \
--- a/15
+++ b/15
@@ -60,6 +60,14 @@ pipeline {
                         echo none
                       fi''',
            returnStdout: true).trim()
+          env.FUNDING_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e ./.github/FUNDING.yml ] ; then
+                         cat ./.github/FUNDING.yml | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@@ -234,15 +242,18 @@ pipeline {
              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
              if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
                 [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
-                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml
                cd ${TEMPDIR}/repo/${LS_REPO}/
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml
                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
--- a/README.md
+++ b/README.md
@@ -1,5 +1,12 @@
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

+[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
+[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
+
 The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-

 * regular and timely application updates
@@ -9,17 +16,20 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
 * regular security updates

 Find us at:
-* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
-* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
+* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
+* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
+* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
+* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
+* [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)
-[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
-[![](https://images.microbadger.com/badges/version/linuxserver/tvheadend.svg)](https://microbadger.com/images/linuxserver/tvheadend "Get your own version badge on microbadger.com")
-[![](https://images.microbadger.com/badges/image/linuxserver/tvheadend.svg)](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)
-![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)
-[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-tvheadend/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-tvheadend/job/master/)
+[![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.
@@ -31,7 +41,7 @@ Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV D

 ## Supported Architectures

-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). 
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

 Simply pulling `linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

@@ -72,14 +82,15 @@ docker create \
  -v <path to data>:/config \
  -v <path to recordings>:/recordings \
  --device /dev/dri:/dev/dri `#optional` \
-  --device /dev/drb:/dev/dvb `#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 of a limitation in docker and multicast.
+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.


 ### docker-compose
@@ -106,7 +117,7 @@ services:
      - 9982:9982
    devices:
      - /dev/dri:/dev/dri #optional
-      - /dev/drb:/dev/dvb #optional
+      - /dev/dvb:/dev/dvb #optional
    restart: unless-stopped
 ```

@@ -208,17 +219,17 @@ In some cases it might be necessary to start tvheadend with additional parameter

 * Shell access whilst the container is running: `docker exec -it tvheadend /bin/bash`
 * To monitor the logs of the container in realtime: `docker logs -f tvheadend`
-* container version number 
+* container version number
  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' tvheadend`
 * image version number
  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/tvheadend`

 ## Updating Info

-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.  
-  
-Below are the instructions for updating containers:  
-  
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+
+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`
@@ -249,7 +260,7 @@ Below are the instructions for updating containers:

 ## Building locally

-If you want to make local modifications to these images for development purposes or just to customize the logic: 
+If you want to make local modifications to these images for development purposes or just to customize the logic:
 ```
 git clone https://github.com/linuxserver/docker-tvheadend.git
 cd docker-tvheadend
@@ -268,6 +279,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **02.10.19:** - Improve permission fixing on render & dvb devices.
+* **18.08.19:** - Add AMD drivers.
+* **02.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.
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,7 +1,7 @@
 alpine-baselayout-3.1.2-r0
 alpine-keys-2.1-r2
 alsa-lib-1.1.9-r0
-apk-tools-2.10.4-r1
+apk-tools-2.10.4-r2
 bash-5.0.0-r0
 bsd-compat-headers-0.7.1-r0
 busybox-1.30.1-r2
@@ -9,10 +9,11 @@ bzip2-1.0.6-r7
 ca-certificates-20190108-r0
 ca-certificates-cacert-20190108-r0
 coreutils-8.31-r0
-curl-7.65.1-r0
-expat-2.2.7-r0
-ffmpeg-4.1.3-r1
-ffmpeg-libs-4.1.3-r1
+curl-7.66.0-r0
+elfutils-libelf-0.168-r2
+expat-2.2.8-r0
+ffmpeg-4.1.4-r0
+ffmpeg-libs-4.1.4-r0
 fontconfig-2.13.1-r0
 freetype-2.10.0-r0
 fribidi-1.0.5-r1
@@ -28,13 +29,13 @@ libattr-2.4.48-r0
 libbsd-0.9.1-r0
 libbz2-1.0.6-r7
 libc-utils-0.7.1-r0
-libcrypto1.1-1.1.1c-r0
-libcurl-7.65.1-r0
+libcrypto1.1-1.1.1d-r0
+libcurl-7.66.0-r0
 libdrm-2.4.98-r0
 libdvbcsa-1.1.0-r1
 libffi-3.2.1-r6
 libgcc-8.3.0-r0
-libgcrypt-1.8.4-r1
+libgcrypt-1.8.4-r2
 libgpg-error-1.36-r2
 libhdhomerun-libs-20161117-r1
 libidn-1.35-r0
@@ -42,9 +43,9 @@ libjpeg-turbo-2.0.2-r0
 libogg-1.3.3-r2
 libpciaccess-0.14-r0
 libpng-1.6.37-r1
-libssl1.1-1.1.1c-r0
+libssl1.1-1.1.1d-r0
 libstdc++-8.3.0-r0
-libtasn1-4.13-r0
+libtasn1-4.14-r0
 libtheora-1.1.1-r14
 libtls-standalone-2.9.1-r0
 libunistring-0.9.10-r0
@@ -55,24 +56,29 @@ libva-intel-driver-2.3.0-r0
 libvdpau-1.2-r0
 libvorbis-1.3.6-r2
 libvpx-1.8.0-r0
-libx11-1.6.8-r0
+libx11-1.6.8-r1
 libxau-1.0.9-r0
 libxcb-1.13.1-r0
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-5.0.3-r2
 libxml2-2.9.9-r2
+libxshmfence-1.3-r0
 libxslt-1.1.33-r1
 linux-headers-4.19.36-r0
 linux-pam-1.3.0-r1
-musl-1.1.22-r2
-musl-utils-1.1.22-r2
+llvm8-libs-8.0.0-r1
+mesa-19.0.6-r0
+mesa-dri-ati-19.0.6-r0
+mesa-glapi-19.0.6-r0
+musl-1.1.22-r3
+musl-utils-1.1.22-r3
 ncurses-libs-6.1_p20190518-r0
 ncurses-terminfo-6.1_p20190518-r0
 ncurses-terminfo-base-6.1_p20190518-r0
 nettle-3.4.1-r1
-nghttp2-libs-1.38.0-r0
-openssl-1.1.1c-r0
+nghttp2-libs-1.39.2-r0
+openssl-1.1.1d-r0
 opus-1.3.1-r0
 p11-kit-0.23.16.1-r0
 pcre2-10.33-r0
@@ -200,12 +206,12 @@ perl-yaml-syck-1.31-r1
 python2-2.7.16-r1
 readline-8.0.0-r0
 scanelf-1.2.3-r0
-sdl2-2.0.9-r0
+sdl2-2.0.10-r0
 shadow-4.6-r2
 sqlite-libs-3.28.0-r0
 ssl_client-1.30.1-r2
 tar-1.32-r0
-tzdata-2019a-r0
+tzdata-2019b-r0
 uriparser-0.9.3-r0
 v4l-utils-libs-1.16.6-r0
 wayland-libs-client-1.17.0-r0
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -53,14 +53,15 @@ 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/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." }
+  - { 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." }
 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 of a limitation in docker and multicast.
+    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.

 # application setup block
 app_setup_block_enabled: true
@@ -125,6 +126,9 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
+  - { date: "18.08.19:", desc: "Add AMD drivers." }
+  - { date: "02.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." }
--- a/root/etc/cont-init.d/50-gid-video
+++ b/root/etc/cont-init.d/50-gid-video
@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bash
+
+FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
+
+for i in $FILES
+do
+	VIDEO_GID=$(stat -c '%g' "$i")
+	if id -G abc | grep -qw "$VIDEO_GID"; then
+		touch /groupadd
+	else
+		if [ ! "${VIDEO_GID}" == '0' ]; then
+			VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
+			if [ -z "${VIDEO_NAME}" ]; then
+				VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)"
+				groupadd "$VIDEO_NAME"
+				groupmod -g "$VIDEO_GID" "$VIDEO_NAME"
+			fi
+			usermod -a -G "$VIDEO_NAME" abc
+			touch /groupadd
+		fi
+	fi
+done
+
+if [ -n "${FILES}" ] && [ ! -f "/groupadd" ]; then
+	usermod -a -G root abc
+fi
Author	SHA1	Message	Date
aptalca	70b794cabc	Improve permission fixing on render & dvb devices	2019-10-02 17:10:12 -04:00
LinuxServer-CI	9a7b46c55c	Bot Updating Package Versions	2019-09-26 22:46:14 -04:00
LinuxServer-CI	48be429287	Bot Updating Package Versions	2019-09-20 03:36:48 +01:00
LinuxServer-CI	0cee1652df	Bot Updating Package Versions	2019-09-05 22:48:01 -04:00
LinuxServer-CI	87a4772008	Bot Updating Templated Files	2019-09-06 03:04:00 +01:00
LinuxServer-CI	cd589b5edc	Bot Updating Templated Files	2019-09-06 03:03:00 +01:00
LinuxServer-CI	7621f743f9	Bot Updating Package Versions	2019-08-29 22:29:53 -04:00
LinuxServer-CI	2c722cf6f5	Bot Updating Package Versions	2019-08-23 03:28:34 +01:00
LinuxServer-CI	fbe55624ba	Bot Updating Package Versions	2019-08-18 15:38:08 -04:00
nRaecheR	05dfb9ffb3	Add support for hardware accelerated transcoding on AMD platforms (#129 ) * Add support for hardware accelerated transcoding on AMD platforms * #139 piggyback this PR to fix typo	2019-08-18 12:03:48 -07:00
LinuxServer-CI	ac4f7d401e	Bot Updating Package Versions	2019-08-15 14:58:04 +01:00
LinuxServer-CI	ed43e439b6	Bot Updating Templated Files	2019-08-15 09:04:42 -04:00
aptalca	f406290afe	Merge pull request #138 from anoma/master Clarify Multicast requirement	2019-08-15 09:02:45 -04:00
anoma	7520004527	Merge pull request #1 from anoma/UDP-1900-wording Clarify Multicast requirement	2019-08-15 06:49:27 +00:00
anoma	18489b187b	Clarify Multicast requirement Closes #100	2019-08-15 06:18:05 +00:00
aptalca	621a1dc880	fix video device permissions	2019-08-02 11:08:47 -07:00
LinuxServer-CI	c6d1618f97	Bot Updating Package Versions	2019-07-29 20:49:34 +00:00
LinuxServer-CI	7d62763012	Bot Updating Package Versions	2019-07-26 03:42:31 +01:00
LinuxServer-CI	22930512ea	Bot Updating Package Versions	2019-07-18 22:42:50 -04:00