Merge pull request #177 from linuxserver/master-jammy

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -12,13 +14,9 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
-  echo "**** install packages ****" && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends \
-    gnupg && \
   echo "**** install jellyfin *****" && \
   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
-  echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
+  echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin-server"; \
   else \
@@ -32,7 +30,7 @@ RUN \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
-    libssl1.1 \
+    libssl3 \
     mesa-va-drivers && \
   echo "**** cleanup ****" && \
   rm -rf \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -12,15 +14,9 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
-  echo "**** install packages ****" && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends \
-    gnupg && \
   echo "**** install jellyfin *****" && \
   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
-  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
-  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
-  echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
+  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin-server"; \
   else \
@@ -37,7 +33,7 @@ RUN \
     libomxil-bellagio0 \
     libomxil-bellagio-bin \
     libraspberrypi0 \
-    libssl1.1 && \
+    libssl3 && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -12,15 +14,9 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
-  echo "**** install packages ****" && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends \
-    gnupg && \
   echo "**** install jellyfin *****" && \
   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
-  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
-  echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
-  echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
+  echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin-server"; \
   else \
@@ -37,7 +33,7 @@ RUN \
     libomxil-bellagio0 \
     libomxil-bellagio-bin \
     libraspberrypi0 \
-    libssl1.1 && \
+    libssl3 && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

README.md

@@ -303,6 +303,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.12.22:** - Rebase master to Jammy, migrate to s6v3.
 * **11.06.22:** - Switch to upstream repo's ffmpeg5 build.
 * **05.01.22:** - Specify Intel iHD driver versions to avoid mismatched libva errors.
 * **25.12.21:** - Fix video device group perms error message.

readme-vars.yml

@@ -116,6 +116,7 @@ unraid_template_sync: false
 
 # changelog
 changelogs:
+  - { date: "07.12.22:", desc: "Rebase master to Jammy, migrate to s6v3." }
   - { date: "11.06.22:", desc: "Switch to upstream repo's ffmpeg5 build." }
   - { date: "05.01.22:", desc: "Specify Intel iHD driver versions to avoid mismatched libva errors." }
   - { date: "25.12.21:", desc: "Fix video device group perms error message." }

root/etc/s6-overlay/s6-rc.d/init-jellyfin-config/run

@@ -7,7 +7,7 @@ mkdir -p \
     /transcode
 
 # permissions
-chown abc:abc \
+lsiown abc:abc \
     /config \
     /config/* \
     /config/data/transcodes \

root/etc/s6-overlay/s6-rc.d/init-jellyfin-config/type

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

root/etc/s6-overlay/s6-rc.d/init-jellyfin-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-jellyfin-config/run

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+
+export \
+    JELLYFIN_DATA_DIR="/config/data" \
+    JELLYFIN_CONFIG_DIR="/config" \
+    JELLYFIN_LOG_DIR="/config/log" \
+    JELLYFIN_CACHE_DIR="/config/cache" \
+    JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8096" \
+        s6-setuidgid abc /usr/bin/jellyfin \
+        --ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg

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

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

root/etc/services.d/jellyfin/run

@@ -1,17 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-export \
-    JELLYFIN_DATA_DIR="/config/data" \
-    JELLYFIN_CONFIG_DIR="/config" \
-    JELLYFIN_LOG_DIR="/config/log" \
-    JELLYFIN_CACHE_DIR="/config/cache"
-
-if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-    echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
-    umask ${UMASK_SET}
-fi
-
-exec \
-    s6-setuidgid abc /usr/bin/jellyfin \
-    --ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg \
-    --webdir=/usr/share/jellyfin/web