Merge pull request #2038 from alexbelgium/codex/fix-s6-svwait-error-in-script

scrutiny: remove s6 dependency in finish script
This commit is contained in:
Alexandre
2025-08-15 18:05:54 +02:00
committed by GitHub
3 changed files with 11 additions and 7 deletions

View File

@@ -1,3 +1,6 @@
## v0.8.1-12 (16-08-2025)
- Replace s6-based shutdown with standard command to avoid s6-svwait error
## v0.8.1-11 (15-08-2025) ## v0.8.1-11 (15-08-2025)
- Minor bugs fixed - Minor bugs fixed
## v0.8.1-10 (13-08-2025) ## v0.8.1-10 (13-08-2025)

View File

@@ -120,5 +120,5 @@
"slug": "scrutiny", "slug": "scrutiny",
"udev": true, "udev": true,
"url": "https://github.com/AnalogJ/scrutiny", "url": "https://github.com/AnalogJ/scrutiny",
"version": "v0.8.1-11" "version": "v0.8.1-12"
} }

13
scrutiny/rootfs/etc/services.d/nginx/finish Normal file → Executable file
View File

@@ -1,8 +1,9 @@
#!/usr/bin/execlineb -S0 #!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ============================================================================== # ==============================================================================
# Take down the S6 supervision tree when Nginx fails # Stop the container when Nginx fails
# ============================================================================== # ==============================================================================
if { s6-test ${1} -ne 0 } if [[ "$1" -ne 0 && "$1" -ne 256 ]]; then
if { s6-test ${1} -ne 256 } bashio::log.error "Nginx exited with code $1"
kill -15 1
s6-svscanctl -t /var/run/s6/services fi