Merge pull request #339 from linuxserver/revert-338-revert-337-jammy

Revert "Revert "rebase plex to jammy, update to s6v3, remove opencl drivers""

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -22,18 +22,10 @@ ENV DEBIAN_FRONTEND="noninteractive" \
   PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)"
 
 RUN \
-  echo "**** add Intel repo ****" && \
-  curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \
-  echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \
   echo "**** install runtime packages ****" && \
   apt-get update && \
   apt-get install -y \
     jq \
-    intel-igc-cm=1.0.128+i699.3~u20.04 \
-    intel-opencl-icd=21.49.21786+i643~u20.04 \
-    libigc1=1.0.10409+i699.3~u20.04 \
-    libigdfcl1=1.0.10409+i699.3~u20.04 \
-    libigdgmm11=21.3.3+i643~u20.04 \
     udev \
     unrar \
     wget && \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE

README.md

@@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex).
 * **18.07.22:** - Pin all opencl related driver packages.
 * **16.05.22:** - Pin opencl version.
 * **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw.

readme-vars.yml

@@ -107,6 +107,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)." }
   - { date: "18.07.22:", desc: "Pin all opencl related driver packages." }
   - { date: "16.05.22:", desc: "Pin opencl version." }
   - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." }

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

@@ -16,8 +16,9 @@ if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then
 fi
 
 # remove plex pid after unclean stop
-[[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]] && \
-rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid"
+if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]]; then
+    rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid"
+fi
 
 # permissions (non-recursive) on config root and folders
 chown abc:abc \

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

@@ -0,0 +1 @@
+oneshot

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

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-plex-chown/run

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

@@ -1,6 +1,10 @@
 #!/usr/bin/with-contenv bash
 
-if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then
+if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; then
+    echo "**** Server already claimed ****"
+    exit 0
+elif [ -z "$PLEX_CLAIM" ]; then
+    echo "**** Server is unclaimed, but no claim token has been set ****"
     exit 0
 fi
 PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml"
@@ -76,4 +80,4 @@ if [ -n "$PlexOnlineToken" ]; then
     sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}"
 else
     echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token."
-fi
+fi

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

@@ -0,0 +1 @@
+oneshot

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

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-plex-claim/run

root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run

root/etc/s6-overlay/s6-rc.d/init-plex-update/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-plex-update/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-plex-update/run

root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-plex/run

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)"
+export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m)
+export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r)
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 32400" \
+        s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server"

root/etc/s6-overlay/s6-rc.d/svc-plex/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/plex/run

@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-echo "Starting Plex Media Server."
-export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m)
-export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r)
-exec \
-    s6-setuidgid abc \
-    /usr/lib/plexmediaserver/Plex\ Media\ Server