Skip to content

Commit

Permalink
Remove stop_docker from CI script
Browse files Browse the repository at this point in the history
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
  • Loading branch information
philwebb committed Sep 4, 2019
1 parent f1bbb2a commit 7c7ad03
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions ci/images/docker-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit 7c7ad03

Please sign in to comment.