avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-08-21 04:13:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix Scrutiny startup without s6 supervision
This commit is contained in:
Alexandre
2026-07-18 10:33:59 +02:00
committed by GitHub
parent c7e9d3933f 8a3710a9d2
commit b0e3a5296e
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scrutiny/CHANGELOG.md
View File

@@ -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) ## v1.67.0 (2026-07-18)
- Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases) - Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases)
@@ -178,4 +181,4 @@
## 27b923b5-ls11 ## 27b923b5-ls11
- Enables PUID/PGID options - Enables PUID/PGID options
- Daily update of values - Daily update of values

8
scrutiny/Dockerfile
View File

@@ -35,6 +35,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
COPY rootfs/ / COPY rootfs/ /
RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \; 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 # Uses /bin for compatibility purposes
# hadolint ignore=DL4005 # hadolint ignore=DL4005
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ 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 \ --retries=5 \
--start-period=30s \ --start-period=30s \
--timeout=25s \ --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

2
scrutiny/config.yaml
View File

@@ -113,4 +113,4 @@ schema:
slug: scrutiny slug: scrutiny
udev: true udev: true
url: https://github.com/Starosdev/scrutiny url: https://github.com/Starosdev/scrutiny
version: "v1.67.0" version: "v1.67.0-2"

5
scrutiny_fa/CHANGELOG.md
View File

@@ -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) ## v1.67.0 (2026-07-18)
- Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases) - Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases)
@@ -183,4 +186,4 @@
## 27b923b5-ls11 ## 27b923b5-ls11
- Enables PUID/PGID options - Enables PUID/PGID options
- Daily update of values - Daily update of values

8
scrutiny_fa/Dockerfile
View File

@@ -35,6 +35,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
COPY rootfs/ / COPY rootfs/ /
RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \; 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 # Uses /bin for compatibility purposes
# hadolint ignore=DL4005 # hadolint ignore=DL4005
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ 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 \ --retries=5 \
--start-period=30s \ --start-period=30s \
--timeout=25s \ --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

2
scrutiny_fa/config.yaml
View File

@@ -45,4 +45,4 @@ schema:
slug: scrutiny_fa slug: scrutiny_fa
udev: true udev: true
url: https://github.com/Starosdev/scrutiny url: https://github.com/Starosdev/scrutiny
version: "v1.67.0" version: "v1.67.0-2"