fix: dind image readiness, exit codes and shutdown order (#1265)

Fixes https://gitea.com/gitea/runner/issues/1263

- Wait for dockerd without a check limit. s6 readiness gave up after 7 checks, so the runner never started on slow hosts, also seen in https://gitea.com/gitea/runner/issues/712, https://gitea.com/gitea/runner/issues/652 and https://gitea.com/gitea/runner/issues/758.
- Let the runner run the docker service's readiness check itself instead of reading s6 status, which can be missing at startup or stale after an unclean stop.
- Exit the container with the first failing service's exit code instead of always 0, so `restart: on-failure` works. A requested stop still exits 0.
- Stop the runner before dockerd, so running jobs can finish within `shutdown_timeout`. The stop grace period has to cover that drain.
- Check the supervision exit codes in `make test-dind`.

---------

Co-authored-by: bircni <[email protected]>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1265
Reviewed-by: bircni <[email protected]>
This commit is contained in:
silverwindandbircni committed 2026-10-01 13:22:25 +00:00
1 parent 568f89d186
commit 05162998eb
9 files changed
+59 -10

No files matched your search

+5 -1
View File
@@ -1,4 +1,8 @@
#!/usr/bin/env bash
exec s6-svscanctl -t /etc/s6
if [ "$1" -eq 256 ]; then
set -- "$((128 + $2))"
fi
(set -C; echo "$1" > "$(/etc/s6/.s6-svscan/exitcode-path)") 2> /dev/null
s6-svscanctl -t /etc/s6 && exit 125 # 125 keeps s6 from restarting the service during teardown
+1 -1
View File
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
exec s6-notifyoncheck dockerd-entrypoint.sh
exec s6-notifyoncheck -n 0 dockerd-entrypoint.sh