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
This commit is contained in:
Phillip Webb 2019-09-04 14:51:33 -07:00
parent f1bbb2a017
commit 7c7ad03e1e
1 changed files with 0 additions and 11 deletions

View File

@ -93,20 +93,9 @@ start_docker() {
export server_args DOCKER_LOG_FILE
declare -fx try_start
trap stop_docker EXIT
if ! timeout ${STARTUP_TIMEOUT} bash -ce 'while true; do try_start && break; done'; then
echo Docker failed to start within ${STARTUP_TIMEOUT} seconds.
return 1
fi
}
stop_docker() {
local pid=$(cat /tmp/docker.pid)
if [ -z "$pid" ]; then
return 0
fi
kill -TERM $pid
}