From 7127098f86d7eca1a2d5ff42897958e1a0bed812 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Mon, 17 Sep 2018 13:25:30 -0700 Subject: [PATCH] Remove call to stop_docker --- ci/images/docker-lib.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh index 497a422ceb..d16a9a67fc 100644 --- a/ci/images/docker-lib.sh +++ b/ci/images/docker-lib.sh @@ -66,22 +66,10 @@ start_docker() { docker daemon --data-root /scratch/docker ${server_args} >/tmp/docker.log 2>&1 & echo $! > /tmp/docker.pid - trap stop_docker EXIT - sleep 1 until docker info >/dev/null 2>&1; do echo waiting for docker to come up... sleep 1 done -} - -stop_docker() { - local pid=$(cat /tmp/docker.pid) - if [ -z "$pid" ]; then - return 0 - fi - - kill -TERM $pid - wait $pid } \ No newline at end of file