From 7c7ad03e1e9b311c47a4c0721a4148554408cfac Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 4 Sep 2019 14:51:33 -0700
Subject: [PATCH] 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
---
 ci/images/docker-lib.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh
index 4c7b1d585ed..bcc0f33a013 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
-}
-