mirror of
https://github.com/linuxserver/docker-jellyfin.git
synced 2025-10-27 03:03:38 +09:00
Move check to file to match master
This commit is contained in:
@@ -26,7 +26,8 @@ RUN \
|
|||||||
at \
|
at \
|
||||||
jellyfin-server=${JELLYFIN_RELEASE} \
|
jellyfin-server=${JELLYFIN_RELEASE} \
|
||||||
jellyfin-ffmpeg6 \
|
jellyfin-ffmpeg6 \
|
||||||
mesa-va-drivers && \
|
mesa-va-drivers \
|
||||||
|
xmlstarlet && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/* \
|
/tmp/* \
|
||||||
@@ -34,7 +35,7 @@ RUN \
|
|||||||
/var/tmp/*
|
/var/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 8096 8920
|
EXPOSE 8096 8920
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ RUN \
|
|||||||
jellyfin-ffmpeg6 \
|
jellyfin-ffmpeg6 \
|
||||||
libomxil-bellagio0 \
|
libomxil-bellagio0 \
|
||||||
libomxil-bellagio-bin \
|
libomxil-bellagio-bin \
|
||||||
libraspberrypi0 && \
|
libraspberrypi0 \
|
||||||
|
xmlstarlet && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/* \
|
/tmp/* \
|
||||||
@@ -36,7 +37,7 @@ RUN \
|
|||||||
/var/tmp/*
|
/var/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 8096 8920
|
EXPOSE 8096 8920
|
||||||
|
|||||||
9
root/etc/s6-overlay/s6-rc.d/svc-jellyfin/data/check
Executable file
9
root/etc/s6-overlay/s6-rc.d/svc-jellyfin/data/check
Executable file
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
PORT=$(xmlstarlet sel -T -t -v /NetworkConfiguration/HttpServerPortNumber /config/network.xml)
|
||||||
|
|
||||||
|
if [[ $(curl -sL "http://localhost:${PORT:-8096}/health" 2>/dev/null) = "Healthy" ]]; then
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
@@ -13,6 +13,6 @@ export \
|
|||||||
JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
|
JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
|
||||||
|
|
||||||
exec \
|
exec \
|
||||||
s6-notifyoncheck -d -n 300 -w 1000 -c "curl -s --output /dev/null http://localhost:8096/health" \
|
s6-notifyoncheck -d -n 300 -w 1000 \
|
||||||
s6-setuidgid abc /usr/bin/jellyfin \
|
s6-setuidgid abc /usr/bin/jellyfin \
|
||||||
--ffmpeg="${FFMPEG_PATH}"
|
--ffmpeg="${FFMPEG_PATH}"
|
||||||
|
|||||||
Reference in New Issue
Block a user