From 0e271350f612f2a64a91d64b5efc9b3d0d0a09b0 Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 8 Jan 2025 11:43:21 +0000 Subject: [PATCH] Don't persist DOCKER_MODS between runs --- root/app/update-mods.sh | 4 ++++ root/etc/s6-overlay/s6-rc.d/init-modmanager-config/run | 2 ++ 2 files changed, 6 insertions(+) diff --git a/root/app/update-mods.sh b/root/app/update-mods.sh index b7bc2ab..dc5987f 100755 --- a/root/app/update-mods.sh +++ b/root/app/update-mods.sh @@ -35,6 +35,10 @@ find_docker_mods() { } # Main script loop + +# Reset DOCKER_MODS to whatever value the user passed into the container at creation time +DOCKER_MODS="${DOCKER_MODS_STATIC}" + if [[ -e "/var/run/docker.sock" ]] || [[ -n "${DOCKER_HOST}" ]]; then find_docker_mods "${DOCKER_HOST:-docker.sock}" "default" fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-modmanager-config/run b/root/etc/s6-overlay/s6-rc.d/init-modmanager-config/run index 84b9c64..33989a1 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-modmanager-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-modmanager-config/run @@ -17,4 +17,6 @@ fi echo "[mod-init] Mod updates will run every 6 hours at ${CRON_MINS} minutes past the hour. Next update will be at $(date -d${NEXT_HOUR}:${CRON_MINS} '+%H:%m')." +printf %s "${DOCKER_MODS}" > /run/s6/container_environment/DOCKER_MODS_STATIC + /app/update-mods.sh