From 64aed46150d64be24921d6f1536b506bd86ae607 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Tue, 9 Dec 2025 12:58:58 -0500 Subject: [PATCH 1/3] use device perm fixer from baseimage --- Dockerfile | 3 +- Dockerfile.aarch64 | 3 +- .../s6-rc.d/init-plex-gid-video/run | 37 ------------------- .../s6-rc.d/init-plex-gid-video/type | 1 - .../s6-overlay/s6-rc.d/init-plex-gid-video/up | 1 - .../dependencies.d/init-plex-claim | 0 .../dependencies.d/init-plex-gid-video | 0 .../user/contents.d/init-plex-gid-video | 0 8 files changed, 4 insertions(+), 41 deletions(-) delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up rename root/etc/s6-overlay/s6-rc.d/{init-plex-gid-video => init-plex-update}/dependencies.d/init-plex-claim (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video diff --git a/Dockerfile b/Dockerfile index bf19423..0ad3c08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_USER="abc" \ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" \ - TMPDIR=/run/plex-temp + TMPDIR=/run/plex-temp \ + ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb -type c" RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b1c14c6..50d9455 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -21,7 +21,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_USER="abc" \ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" \ - TMPDIR=/run/plex-temp + TMPDIR=/run/plex-temp \ + ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb -type c" RUN \ echo "**** install runtime packages ****" && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run deleted file mode 100755 index 083570f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -if [[ -z ${LSIO_NON_ROOT_USER} ]]; then - FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) - - for i in ${FILES}; do - VIDEO_GID=$(stat -c '%g' "${i}") - VIDEO_UID=$(stat -c '%u' "${i}") - # check if user matches device - if id -u abc | grep -qw "${VIDEO_UID}"; then - echo "**** permissions for ${i} are good ****" - else - # check if group matches and that device has group rw - if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then - echo "**** permissions for ${i} are good ****" - # check if device needs to be added to video group - elif ! id -G abc | grep -qw "${VIDEO_GID}"; then - # check if video group needs to be created - VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') - if [[ -z "${VIDEO_NAME}" ]]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" - groupadd "${VIDEO_NAME}" - groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" - echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" - fi - echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" - usermod -a -G "${VIDEO_NAME}" abc - fi - # check if device has group rw - if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then - echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" - chmod g+rw "${i}" - fi - fi - done -fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up deleted file mode 100644 index 05f6fde..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-claim similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim rename to root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-claim diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video deleted file mode 100644 index e69de29..0000000 From f32896aed44c649aa06a8574e6e7e3c98dd22ccc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Dec 2025 16:34:25 +0000 Subject: [PATCH 2/3] Bot Updating Templated Files --- readme-vars.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 7e2ea93..2ad47e0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -112,8 +112,7 @@ init_diagram: | init-envfile -> init-os-end init-config -> init-plex-chown init-plex-chown -> init-plex-claim - init-plex-claim -> init-plex-gid-video - init-plex-gid-video -> init-plex-update + init-plex-claim -> init-plex-update init-custom-files -> init-services init-services -> svc-cron svc-cron -> legacy-services From 8056a354f583645d60f4ac2eb208f38b6ac06b4a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 22 Dec 2025 09:35:14 +0000 Subject: [PATCH 3/3] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b665769..5c9db03 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ apt-utils 2.8.3 deb base-files 13ubuntu10.3 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6.3 deb +bsdutils 1:2.39.3-9ubuntu6.4 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6.1 deb @@ -43,7 +43,7 @@ libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1.1 deb libaudit-common 1:3.1.2-2.1build1.1 deb libaudit1 1:3.1.2-2.1build1.1 deb -libblkid1 2.39.3-9ubuntu6.3 deb +libblkid1 2.39.3-9ubuntu6.4 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb @@ -78,7 +78,7 @@ libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb libmd0 1.1.0-2build1.1 deb -libmount1 2.39.3-9ubuntu6.3 deb +libmount1 2.39.3-9ubuntu6.4 deb libncursesw6 6.4+20240113-1ubuntu2 deb libnettle8t64 3.9.1-2.2build1.1 deb libnghttp2-14 1.59.0-1ubuntu0.2 deb @@ -102,25 +102,25 @@ libselinux1 3.5-2ubuntu2.1 deb libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6.3 deb +libsmartcols1 2.39.3-9ubuntu6.4 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.2 deb libssl3t64 3.0.13-0ubuntu3.6 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.11 deb +libsystemd0 255.4-1ubuntu8.12 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.11 deb +libudev1 255.4-1ubuntu8.12 deb libunistring5 1.1-2build1.1 deb -libuuid1 2.39.3-9ubuntu6.3 deb +libuuid1 2.39.3-9ubuntu6.4 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb locales 2.39-0ubuntu8.6 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6.3 deb +mount 2.39.3-9ubuntu6.4 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb @@ -134,15 +134,15 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.11 deb +systemd-dev 255.4-1ubuntu8.12 deb systemd-hwe-hwdb 255.1.6 deb -systemd-standalone-sysusers 255.4-1ubuntu8.11 deb +systemd-standalone-sysusers 255.4-1ubuntu8.12 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.11 deb +udev 255.4-1ubuntu8.12 deb unminimize 0.2.1 deb -util-linux 2.39.3-9ubuntu6.3 deb +util-linux 2.39.3-9ubuntu6.4 deb wget 1.21.4-1ubuntu4.1 deb zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb