Merge remote-tracking branch 'upstream/master'

Changes init-plex-chown/run to use TMPDIR instead of hardcoded /run/plex-temp

Plex uses TMPDIR to store transcodes of music to WAV format for music
analysis (and maybe other things).

LS.io container sets TMPDIR=/run/plex-temp.  With read-only root this
means the /run tmpfs needs to have enough memory to store music analysis
transcodes.

LS.io container hardcoded /run/plex-temp in init so TMPDIR could not be
flexibly changed -- changed to use TMPDIR and clean on restart in case
of unclean shutdown.

Plex container is marked as supporting read-only root.

README.md

@@ -385,6 +385,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.03.26:** - Allow TMPDIR to be changed to better support read-only containers
+* **15.03.26:** - Fix initial claim setup on non-root containers
 * **04.11.24:** - Add Nvidia capability needed for h265
 * **18.07.24:** - Rebase to Ubuntu Noble.
 * **12.02.24:** - Use universal hardware acceleration blurb

package_versions.txt

@@ -5,13 +5,13 @@ apt-utils                    2.8.3                              deb
 base-files                   13ubuntu10.4                       deb     
 base-passwd                  3.6.3build1                        deb     
 bash                         5.2.21-2ubuntu4                    deb     
-bsdutils                     1:2.39.3-9ubuntu6.4                deb     
+bsdutils                     1:2.39.3-9ubuntu6.5                deb     
 ca-certificates              20240203                           deb     
 catatonit                    0.1.7-1                            deb     
-coreutils                    9.4-3ubuntu6.1                     deb     
+coreutils                    9.4-3ubuntu6.2                     deb     
 cron                         3.0pl1-184ubuntu2                  deb     
 cron-daemon-common           3.0pl1-184ubuntu2                  deb     
-curl                         8.5.0-2ubuntu10.6                  deb     
+curl                         8.5.0-2ubuntu10.8                  deb     
 dash                         0.5.12-6ubuntu5                    deb     
 debconf                      1.5.86ubuntu1                      deb     
 debianutils                  5.17build1                         deb     
@@ -20,7 +20,7 @@ dirmngr                      2.4.4-2ubuntu17.4                  deb
 dpkg                         1.22.6ubuntu6.5                    deb     
 e2fsprogs                    1.47.0-2.4~exp1ubuntu4.1           deb     
 findutils                    4.9.0-5build1                      deb     
-gcc-14-base                  14.2.0-4ubuntu2~24.04              deb     
+gcc-14-base                  14.2.0-4ubuntu2~24.04.1            deb     
 gnupg                        2.4.4-2ubuntu17.4                  deb     
 gnupg-l10n                   2.4.4-2ubuntu17.4                  deb     
 gnupg-utils                  2.4.4-2ubuntu17.4                  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.4                  deb     
+libblkid1                    2.39.3-9ubuntu6.5                  deb     
 libbrotli1                   1.1.0-2build2                      deb     
 libbsd0                      0.12.1-1build1.1                   deb     
 libbz2-1.0                   1.0.8-5.1build0.1                  deb     
@@ -53,15 +53,15 @@ libcap-ng0                   0.8.4-2build2                      deb
 libcap2                      1:2.66-5ubuntu2.2                  deb     
 libcom-err2                  1.47.0-2.4~exp1ubuntu4.1           deb     
 libcrypt1                    1:4.4.36-4build1                   deb     
-libcurl4t64                  8.5.0-2ubuntu10.6                  deb     
+libcurl4t64                  8.5.0-2ubuntu10.8                  deb     
 libdb5.3t64                  5.3.28+dfsg2-7                     deb     
 libdebconfclient0            0.271ubuntu3                       deb     
 libext2fs2t64                1.47.0-2.4~exp1ubuntu4.1           deb     
 libffi8                      3.4.6-1build1                      deb     
-libgcc-s1                    14.2.0-4ubuntu2~24.04              deb     
+libgcc-s1                    14.2.0-4ubuntu2~24.04.1            deb     
 libgcrypt20                  1.10.3-2build1                     deb     
 libgmp10                     2:6.3.0+dfsg-2ubuntu6.1            deb     
-libgnutls30t64               3.8.3-1.1ubuntu3.4                 deb     
+libgnutls30t64               3.8.3-1.1ubuntu3.5                 deb     
 libgpg-error0                1.47-3build2.1                     deb     
 libgssapi-krb5-2             1.20.1-6ubuntu2.6                  deb     
 libhogweed6t64               3.9.1-2.2build1.1                  deb     
@@ -78,7 +78,7 @@ libldap2                     2.6.10+dfsg-0ubuntu0.24.04.1       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.4                  deb     
+libmount1                    2.39.3-9ubuntu6.5                  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.4                  deb     
+libsmartcols1                2.39.3-9ubuntu6.5                  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     
+libssh-4                     0.10.6-2ubuntu0.4                  deb     
 libssl3t64                   3.0.13-0ubuntu3.7                  deb     
-libstdc++6                   14.2.0-4ubuntu2~24.04              deb     
+libstdc++6                   14.2.0-4ubuntu2~24.04.1            deb     
-libsystemd0                  255.4-1ubuntu8.12                  deb     
+libsystemd0                  255.4-1ubuntu8.14                  deb     
 libtasn1-6                   4.19.0-3ubuntu0.24.04.2            deb     
 libtinfo6                    6.4+20240113-1ubuntu2              deb     
-libudev1                     255.4-1ubuntu8.12                  deb     
+libudev1                     255.4-1ubuntu8.14                  deb     
 libunistring5                1.1-2build1.1                      deb     
-libuuid1                     2.39.3-9ubuntu6.4                  deb     
+libuuid1                     2.39.3-9ubuntu6.5                  deb     
 libxxhash0                   0.8.2-2build1                      deb     
 libzstd1                     1.5.5+dfsg2-2build1.1              deb     
 locales                      2.39-0ubuntu8.7                    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.4                  deb     
+mount                        2.39.3-9ubuntu6.5                  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.12                  deb     
+systemd-dev                  255.4-1ubuntu8.14                  deb     
-systemd-hwe-hwdb             255.1.6                            deb     
+systemd-hwe-hwdb             255.1.7                            deb     
-systemd-standalone-sysusers  255.4-1ubuntu8.12                  deb     
+systemd-standalone-sysusers  255.4-1ubuntu8.14                  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.12                  deb     
+udev                         255.4-1ubuntu8.14                  deb     
 unminimize                   0.2.1                              deb     
-util-linux                   2.39.3-9ubuntu6.4                  deb     
+util-linux                   2.39.3-9ubuntu6.5                  deb     
 wget                         1.21.4-1ubuntu4.1                  deb     
 zlib1g                       1:1.3.dfsg-3.1ubuntu2.1            deb     

readme-vars.yml

@@ -125,6 +125,8 @@ init_diagram: |
   "plex:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "15.03.26:", desc: "Allow TMPDIR to be changed to better support read-only containers"}
+  - {date: "15.03.26:", desc: "Fix initial claim setup on non-root containers"}
   - {date: "04.11.24:", desc: "Add Nvidia capability needed for h265"}
   - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."}
   - {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"}

root/etc/s6-overlay/s6-rc.d/init-plex-chown/run

@@ -1,7 +1,11 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-mkdir -p /run/plex-temp
+# remove plex temporary directory after unclean stop
+if [[ -d "${TMPDIR}" ]]; then
+	rm -rf "${TMPDIR}"
+fi
+mkdir -p ${TMPDIR}
 
 # create folders
 if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then
@@ -40,7 +44,7 @@ if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
 
     # permissions (non-recursive) on config root and folders
     lsiown abc:abc \
-        /run/plex-temp \
+        "${TMPDIR}" \
         /config \
         /config/*
 fi

root/etc/s6-overlay/s6-rc.d/init-plex-claim/run

@@ -19,8 +19,15 @@ if [[ ! -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then
     export PLEX_MEDIA_SERVER_INFO_MODEL
     PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r)
     export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION
-    s6-setuidgid abc /bin/bash -c \
+
-        'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' &
+    if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+        s6-setuidgid abc /bin/bash -c \
+            'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' &
+    else
+        /bin/bash -c \
+            'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' &
+    fi
+
     PID=$!
     echo "Waiting for Plex to generate its config"
     DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal"