Skip to content

Commit 7c7ad03

Browse files
committed
Remove stop_docker from CI script
Update our CI script to no longer attempt to stop docker. We don't call it anyway and it will be one less moving part trying to diagnose why `dockerd` sometimes terminates early. See gh-18127
1 parent f1bbb2a commit 7c7ad03

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

ci/images/docker-lib.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,9 @@ start_docker() {
9393

9494
export server_args DOCKER_LOG_FILE
9595
declare -fx try_start
96-
trap stop_docker EXIT
9796

9897
if ! timeout ${STARTUP_TIMEOUT} bash -ce 'while true; do try_start && break; done'; then
9998
echo Docker failed to start within ${STARTUP_TIMEOUT} seconds.
10099
return 1
101100
fi
102101
}
103-
104-
stop_docker() {
105-
local pid=$(cat /tmp/docker.pid)
106-
if [ -z "$pid" ]; then
107-
return 0
108-
fi
109-
110-
kill -TERM $pid
111-
}
112-

0 commit comments

Comments
 (0)