Merge pull request #2878 from alexbelgium/agent/fix-scrutiny-service-wait

Fix Scrutiny startup without s6 supervision

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)
  

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 && \

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"

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)
  

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 && \

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"