From 52e437770784a9807cdb42407abb1651ae2de139 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sun, 31 Jan 2016 15:45:30 -0500 Subject: [PATCH] wait for the docker container to stop before removing it --- tools/build_test_env.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh index 38e874a98..cbd0d9a82 100755 --- a/tools/build_test_env.sh +++ b/tools/build_test_env.sh @@ -56,7 +56,11 @@ CONFIG=/tmp/python-gitlab.cfg cleanup() { rm -f "${CONFIG}" log "Stopping gitlab-test docker container..." - docker stop gitlab-test >/dev/null 2>&1 + docker stop gitlab-test >/dev/null 2>&1 & + docker_stop_pid=$! + log "Waiting for gitlab-test docker container to exit..." + docker wait gitlab-test >/dev/null 2>&1 + wait "${docker_stop_pid}" log "Removing gitlab-test docker container..." docker rm gitlab-test >/dev/null 2>&1 log "Deactivating Python virtualenv..."