Skip to content

Commit f2ae1ea

Browse files
fix some case where sigterm received before dockerd starts (#35)
1 parent b5d2fcd commit f2ae1ea

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

run.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ if [[ -z "${DISABLE_CLEANER_AGENT}" && -z "${SIGTERM}" ]]; then
232232
fi
233233

234234
DOCKERD_PID=$(cat /run/user/1000/docker.pid)
235-
echo "DOCKERD_PID = ${DOCKERD_PID} "
235+
echo "DOCKERD_PID = ${DOCKERD_PID}"
236+
237+
[[ -n "${SIGTERM}" ]] && kill $DOCKERD_PID
236238

237239
while true; do
238240
# Monitor docker daemon and kill the entrypoint if it dies - before rootless this used to do wait $DOCKERD_PID - but in rootless the daemon is not a direct child of the entrypoint - that's why we need this block

service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 1.26.0
1+
version: 1.26.1

0 commit comments

Comments
 (0)