diff options
| -rwxr-xr-x | go/t/docker/docker_deploy.sh | 2 | ||||
| -rwxr-xr-x | retiolum/t/docker/docker_boostrap.sh | 4 | ||||
| -rwxr-xr-x | ship/t/docker/docker_remote_punani.sh | 4 |
3 files changed, 7 insertions, 3 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)" diff --git a/retiolum/t/docker/docker_boostrap.sh b/retiolum/t/docker/docker_boostrap.sh index 7ae3fd36..82673dd4 100755 --- a/retiolum/t/docker/docker_boostrap.sh +++ b/retiolum/t/docker/docker_boostrap.sh @@ -1,3 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker run -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap >/dev/null +docker_id=$(docker run -d -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 76e34068..1eab1a42 100755 --- a/ship/t/docker/docker_remote_punani.sh +++ b/ship/t/docker/docker_remote_punani.sh @@ -1,3 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker run -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani >/dev/null +docker_id=$(docker run -d -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani) +trap "docker rm $docker_id" INT TERM EXIT QUIT +docker wait $docker_id |