summaryrefslogtreecommitdiffstats
path: root/go/t/docker
diff options
context:
space:
mode:
authorroot <root@cband>2014-01-07 09:12:29 -0600
committerroot <root@cband>2014-01-07 09:12:36 -0600
commite0350203624556364dd240c1470c0faa0bc95160 (patch)
tree56f82b09c484635b4676817c47612be1e2fd72f4 /go/t/docker
parentd80d739902ac45f6afdd3804e1ffe89d711d45e9 (diff)
test:consider docker cleanup after use
Diffstat (limited to 'go/t/docker')
-rwxr-xr-xgo/t/docker/docker_deploy.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/go/t/docker/docker_deploy.sh b/go/t/docker/docker_deploy.sh
index 0e3f1d79..25597bc5 100755
--- a/go/t/docker/docker_deploy.sh
+++ b/go/t/docker/docker_deploy.sh
@@ -5,7 +5,7 @@ rnd_port=$(shuf -i 2000-65000 -n 1)
docker_id=$(docker run -p $rnd_port:80 -d -v /krebs/go/t/docker/../../../:/krebs ubuntu /bin/bash /krebs/go/t/docker/dockertest/deploy)
#docker run -p $rnd_port:80 -v /krebs/go/t/docker/../../../:/krebs ubuntu /bin/bash /krebs/go/t/docker/dockertest/deploy
echo $docker_id on $rnd_port
-trap "docker stop $docker_id" INT TERM EXIT QUIT
+trap "docker stop $docker_id;docker rm $docker_id" INT TERM EXIT QUIT
i=0
max_wait=20
echo "waiting for install (takes about 3 minutes)"