diff --git a/scrutiny/CHANGELOG.md b/scrutiny/CHANGELOG.md index 402c8cb298..20b134b6e4 100644 --- a/scrutiny/CHANGELOG.md +++ b/scrutiny/CHANGELOG.md @@ -1,4 +1,7 @@ +## v1.67.0-2 (2026-07-18) +- Fix startup with the Home Assistant entrypoint by removing the upstream collector's unsupported s6 service wait. The collector still waits for the Scrutiny API health endpoint before running. + ## v1.67.0 (2026-07-18) - Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases) @@ -178,4 +181,4 @@ ## 27b923b5-ls11 - Enables PUID/PGID options -- Daily update of values +- Daily update of values \ No newline at end of file diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 225e41bd91..1f53a04583 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -35,6 +35,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ COPY rootfs/ / RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \; +# The Home Assistant entrypoint starts services directly instead of running s6. +# Scrutiny's collector already waits for the API health endpoint, so remove its s6-only wait. +RUN if grep -q 's6-svwait -u /run/service/scrutiny' /etc/services.d/collector-once/run; then \ + sed -i '\|s6-svwait -u /run/service/scrutiny|d' /etc/services.d/collector-once/run; \ + fi + # Uses /bin for compatibility purposes # hadolint ignore=DL4005 RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ @@ -131,4 +137,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 \ No newline at end of file diff --git a/scrutiny/config.yaml b/scrutiny/config.yaml index ee8a842621..809fca7126 100644 --- a/scrutiny/config.yaml +++ b/scrutiny/config.yaml @@ -113,4 +113,4 @@ schema: slug: scrutiny udev: true url: https://github.com/Starosdev/scrutiny -version: "v1.67.0" +version: "v1.67.0-2" \ No newline at end of file diff --git a/scrutiny_fa/CHANGELOG.md b/scrutiny_fa/CHANGELOG.md index f388e7aac0..1fcb0a29e0 100644 --- a/scrutiny_fa/CHANGELOG.md +++ b/scrutiny_fa/CHANGELOG.md @@ -1,4 +1,7 @@ +## v1.67.0-2 (2026-07-18) +- Fix startup with the Home Assistant entrypoint by removing the upstream collector's unsupported s6 service wait. The collector still waits for the Scrutiny API health endpoint before running. + ## v1.67.0 (2026-07-18) - Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases) @@ -183,4 +186,4 @@ ## 27b923b5-ls11 - Enables PUID/PGID options -- Daily update of values +- Daily update of values \ No newline at end of file diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index c607c3573b..e6cd15a0d2 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -35,6 +35,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ COPY rootfs/ / RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \; +# The Home Assistant entrypoint starts services directly instead of running s6. +# Scrutiny's collector already waits for the API health endpoint, so remove its s6-only wait. +RUN if grep -q 's6-svwait -u /run/service/scrutiny' /etc/services.d/collector-once/run; then \ + sed -i '\|s6-svwait -u /run/service/scrutiny|d' /etc/services.d/collector-once/run; \ + fi + # Uses /bin for compatibility purposes # hadolint ignore=DL4005 RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ @@ -133,4 +139,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 \ No newline at end of file diff --git a/scrutiny_fa/config.yaml b/scrutiny_fa/config.yaml index 0ea8dd342a..4ad8794017 100644 --- a/scrutiny_fa/config.yaml +++ b/scrutiny_fa/config.yaml @@ -45,4 +45,4 @@ schema: slug: scrutiny_fa udev: true url: https://github.com/Starosdev/scrutiny -version: "v1.67.0" +version: "v1.67.0-2" \ No newline at end of file