diff options
| author | makefu <github@syntax-fehler.de> | 2014-03-07 16:04:34 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2014-03-07 16:04:34 +0100 |
| commit | e0a6751890271e073f756cabdf1b9bcdb068712e (patch) | |
| tree | 7b051b181a4f2b63811ad7da1fad3f6919cad345 | |
| parent | dfd5330226d0cd3163cfe92508e29ae7c517498c (diff) | |
unfix all the docker tests, sorry :(
| -rwxr-xr-x | go/t/docker/docker_deploy.sh | 2 | ||||
| -rwxr-xr-x | retiolum/t/docker/docker_boostrap.sh | 2 | ||||
| -rw-r--r-- | ship/src/refresh-supers | 2 | ||||
| -rwxr-xr-x | ship/t/docker/docker_remote_punani.sh | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/go/t/docker/docker_deploy.sh b/go/t/docker/docker_deploy.sh index faf9e605..3e64426d 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 -rm=true -p $rnd_port:80 -d -v /krebs/go/t/docker/../../../:/krebs ubuntu /bin/bash /krebs/go/t/docker/dockertest/deploy) +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;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 6288b09a..82673dd4 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 -rm=true -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) +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/src/refresh-supers b/ship/src/refresh-supers index a35e2229..6dc6e8ab 100644 --- a/ship/src/refresh-supers +++ b/ship/src/refresh-supers @@ -22,6 +22,8 @@ defer "rm -f $tmp_tincconf" sed '/^[ ]*ConnectTo/d' "$tincconf" > "$tmp_tincconf" + +# TODO find_supernodes requires netcat find_supernodes | cut -d\ -f 1 | shuf \ | head -n "${max_connect_to}" \ | xargs -n1 printf "ConnectTo=%s\n" >> "$tmp_tincconf" diff --git a/ship/t/docker/docker_remote_punani.sh b/ship/t/docker/docker_remote_punani.sh index c006f013..1eab1a42 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 -rm=true -d -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani) +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 |