From f8c45fc28964a69d51fe41f967c9fe0734b68a72 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 7 Sep 2026 13:09:39 +0200 Subject: image-builder: abort early when the docker daemon is unreachable A dead dockerd is a global failure, not a per-variant one, but every stage treated it as the latter: the digest probes read an unreachable daemon as "no digest, rebuilding to be safe", the build then failed, and the variant loop logged "WARNING: variant X failed; continuing" and moved on. Cron kept exiting nonzero into a log nobody read, so a daemon that died in August went unnoticed for 25 days while no image was ever rebuilt. Add require_docker() to lib.sh, following the existing require_mount() precedent, and call it before the variant loop in all three stages. One loud error, exit 1, instead of a nightly pile of warnings. In build-full-image.sh the check goes before the --force cache prune, since that prune also talks to the daemon. Self-check stubs `docker` so it never contacts a real daemon. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01AD4jP4wFMpBgEvd9ZP9Xhu --- image-builder/test-image-builder.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'image-builder/test-image-builder.sh') diff --git a/image-builder/test-image-builder.sh b/image-builder/test-image-builder.sh index 525ea8f..5781b22 100755 --- a/image-builder/test-image-builder.sh +++ b/image-builder/test-image-builder.sh @@ -75,6 +75,14 @@ MIRROR="file://$tmp/mnt" MIRROR="https://example/x" ( require_mount current ) 2>/dev/null; check_rc "require_mount http skips" 0 $? +# --- require_docker: stub `docker` so the check never touches a real daemon --- +docker() { return "${DOCKER_RC:-0}"; } +DOCKER_RC=1 +( require_docker ) 2>/dev/null; check_rc "require_docker daemon down" 1 $? +DOCKER_RC=0 +( require_docker ) 2>/dev/null; check_rc "require_docker daemon up" 0 $? +unset -f docker + echo "----" echo "PASS: $pass FAIL: $fail" [[ "$fail" -eq 0 ]] -- cgit v1.2.3