diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh index 4c7b1d585e..bcc0f33a01 100644 --- a/ci/images/docker-lib.sh +++ b/ci/images/docker-lib.sh @@ -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 -} -