From f91c15a6ac8e94dae54f4cdaa93defd3f7006226 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 15:51:25 +0100 Subject: update docker to remove itself after completion --- go/t/docker/docker_deploy.sh | 2 +- retiolum/t/docker/docker_boostrap.sh | 2 +- ship/t/docker/docker_remote_punani.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/t/docker/docker_deploy.sh b/go/t/docker/docker_deploy.sh index 3e64426d..faf9e605 100755 --- a/go/t/docker/docker_deploy.sh +++ b/go/t/docker/docker_deploy.sh @@ -2,7 +2,7 @@ cd $(dirname $(readlink -f $0)) set -xeuf 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_id=$(docker run -rm=true -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;docker rm $docker_id" INT TERM EXIT QUIT diff --git a/retiolum/t/docker/docker_boostrap.sh b/retiolum/t/docker/docker_boostrap.sh index 82673dd4..6288b09a 100755 --- a/retiolum/t/docker/docker_boostrap.sh +++ b/retiolum/t/docker/docker_boostrap.sh @@ -1,5 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker_id=$(docker run -d -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) +docker_id=$(docker run -d -rm=true -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) trap "docker rm $docker_id" INT TERM EXIT QUIT docker wait $docker_id diff --git a/ship/t/docker/docker_remote_punani.sh b/ship/t/docker/docker_remote_punani.sh index 1eab1a42..c006f013 100755 --- a/ship/t/docker/docker_remote_punani.sh +++ b/ship/t/docker/docker_remote_punani.sh @@ -1,5 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker_id=$(docker run -d -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani) +docker_id=$(docker run -rm=true -d -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani) trap "docker rm $docker_id" INT TERM EXIT QUIT docker wait $docker_id -- cgit v1.2.3