Migrate to s6v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage
 
 # build args
 ARG EMBY_RELEASE
@@ -33,7 +33,7 @@ RUN \
     /tmp/opt/emby-server/extra/lib/*
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -41,6 +41,8 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage
 
 # build args
 ARG EMBY_RELEASE
@@ -33,7 +33,7 @@ RUN \
     /tmp/opt/emby-server/extra/lib/*
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -41,6 +41,8 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy as buildstage
 
 # build args
 ARG EMBY_RELEASE
@@ -33,7 +33,7 @@ RUN \
     /tmp/opt/emby-server/extra/lib/*
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -41,6 +41,8 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 

Jenkinsfile

@@ -720,7 +720,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -289,6 +289,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.09.22:** - Migrate to s6v3.
 * **19.05.21:** - Structural changes upstream.
 * **17.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. Remove no longer used mapping for /transcode.
 * **21.12.20:** - Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf.

readme-vars.yml

@@ -90,6 +90,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.09.22:", desc: "Migrate to s6v3." }
   - { date: "19.05.21:", desc: "Structural changes upstream." }
   - { date: "17.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. Remove no longer used mapping for /transcode." }
   - { date: "21.12.20:", desc: "Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." }

root/etc/s6-overlay/s6-rc.d/init-emby/run

@@ -10,6 +10,7 @@ chown abc:abc \
     /config \
     /data \
     /transcode
+
 if [ -n "$(ls -A /data 2>/dev/null)" ]; then
 chown abc:abc \
     /data/*

root/etc/s6-overlay/s6-rc.d/init-emby/type

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

root/etc/s6-overlay/s6-rc.d/init-emby/up

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

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

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

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

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

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

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

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

@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+
+# env settings
+APP_DIR="/app/emby"
+export LD_LIBRARY_PATH="${APP_DIR}"
+export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts
+if [ -d "/lib/x86_64-linux-gnu" ]; then
+    export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/dri
+fi
+export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt
+
+s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8096" \
+    s6-setuidgid abc /app/emby/EmbyServer \
+    -programdata /config \
+    -ffdetect /app/emby/ffdetect \
+    -ffmpeg /app/emby/ffmpeg \
+    -ffprobe /app/emby/ffprobe \
+    -restartexitcode 3

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

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

root/etc/services.d/emby/run

@@ -1,24 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# set umask
-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
-
-# env settings
-APP_DIR="/app/emby"
-export LD_LIBRARY_PATH="${APP_DIR}"
-export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts
-if [ -d "/lib/x86_64-linux-gnu" ]; then
-	export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/dri
-fi
-export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt
-
-exec \
-	s6-setuidgid abc /app/emby/EmbyServer \
-	-programdata /config \
-	-ffdetect /app/emby/ffdetect \
-	-ffmpeg /app/emby/ffmpeg \
-	-ffprobe /app/emby/ffprobe \
-	-restartexitcode 3