linuxserver/docker-jellyfin
1
1
Fork 0
mirror of https://github.com/linuxserver/docker-jellyfin.git synced 2025-11-01 05:27:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from linuxserver/master-ffmpeg

Browse Source 
Check ffmepg path, use proper health endpoint
This commit is contained in:
Adam
2024-05-18 20:07:19 +01:00
committed by GitHub
parent bdc4079d0e 1c26852563
commit 1488417625
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
root/etc/s6-overlay/s6-rc.d/svc-jellyfin/data/check
View File

@@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
PORT=$(xmlstarlet sel -T -t -v /NetworkConfiguration/HttpServerPortNumber /config/network.xml) if [[ -f "/config/network.xml" ]]; then
PORT=$(xmlstarlet sel -T -t -v /NetworkConfiguration/HttpServerPortNumber /config/network.xml)
fi
if [[ $(curl -sL "http://localhost:${PORT:-8096}/health" 2>/dev/null) = "Healthy" ]]; then if [[ $(curl -sL "http://localhost:${PORT:-8096}/health" 2>/dev/null) = "Healthy" ]]; then
exit 0 exit 0

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

@@ -1,6 +1,10 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash # shellcheck shell=bash
if [[ -z "${FFMPEG_PATH}" ]] || [[ ! -f "${FFMPEG_PATH}" ]]; then
FFMPEG_PATH=/usr/lib/jellyfin-ffmpeg/ffmpeg
fi
export \ export \
JELLYFIN_DATA_DIR="/config/data" \ JELLYFIN_DATA_DIR="/config/data" \
JELLYFIN_CONFIG_DIR="/config" \ JELLYFIN_CONFIG_DIR="/config" \
@@ -11,4 +15,4 @@ export \
exec \ exec \
s6-notifyoncheck -d -n 300 -w 1000 \ s6-notifyoncheck -d -n 300 -w 1000 \
s6-setuidgid abc /usr/bin/jellyfin \ s6-setuidgid abc /usr/bin/jellyfin \
--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg --ffmpeg="${FFMPEG_PATH}"