Rebase nightly to jammy, migrate to s6v3

This commit is contained in:
TheSpad
2022-12-07 10:52:25 +00:00
parent 0c6bb3b153
commit a4e90eb36b
23 changed files with 48 additions and 42 deletions

View File

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

View File

@@ -0,0 +1 @@
oneshot

View File

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

View File

@@ -0,0 +1 @@
oneshot

View File

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

View File

@@ -0,0 +1 @@
3

View File

@@ -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

View File

@@ -0,0 +1 @@
longrun

View File

@@ -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" \
JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
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