From ae9ce10f716e65f3d4dce19d0e30cc49128596b5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 23 Sep 2026 15:27:15 +0000 Subject: [PATCH] fix: register docker-init as subreaper in the dind images (#1241) The dind images run `s6-svscan` as PID 1, so the `docker-init` that the upstream entrypoint puts in front of `dockerd` cannot reap and warns on every start. `TINI_SUBREAPER` makes it a subreaper for the daemon's subtree, which is what tini recommends when it is not PID 1. The warning was cosmetic. Orphaned `containerd-shim` processes re-parented to `s6-svscan`, which reaps them just as well, so no zombies accumulated. With this change they re-parent to `docker-init` instead, and the warning is gone. Seen in https://gitea.com/gitea/runner/issues/1240 --------- Co-authored-by: bircni Reviewed-on: https://gitea.com/gitea/runner/pulls/1241 Reviewed-by: bircni Co-authored-by: silverwind --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8a927a89..a025c9c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,8 @@ COPY scripts/s6 /etc/s6 VOLUME /data +ENV TINI_SUBREAPER=1 + ENTRYPOINT ["s6-svscan","/etc/s6"] ### DIND-ROOTLESS VARIANT @@ -56,6 +58,7 @@ VOLUME /data RUN mkdir -p /data && chown -R rootless:rootless /etc/s6 /data ENV DOCKER_HOST=unix:///run/user/1000/docker.sock +ENV TINI_SUBREAPER=1 USER rootless ENTRYPOINT ["s6-svscan","/etc/s6"]