diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-26 14:25:04 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-26 14:25:04 +0000 |
| commit | b5cb6772c4822d92370a54e534096c7ce07f2c3d (patch) | |
| tree | 60debd76b2c3f1a5f09e35d2547333fb0b008de1 | |
| parent | 4199801c5ebf733a0479d872d9ef4bf3f2362f48 (diff) | |
Remove last occurences of docker using TCP socket instead of file socket.
Change-Id: I19ed211d69326ff34a239cb4cc80a6f2b72ccd63
| -rw-r--r-- | jenkins-helpers.sh | 2 | ||||
| -rwxr-xr-x | start-container-qemu.sh | 4 | ||||
| -rwxr-xr-x | tcwg-cleanup-stale-containers.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index f75e4b57..0be9fcc9 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -36,7 +36,7 @@ print_node_with_least_containers () testers=$(print_nodes_in_labels $tester_labels | sort --random-sort) for tester in $testers; do ret=0 - load_value=$(timeout 10s ssh ${tester}.tcwglab docker -H :2375 ps | wc -l) || ret=$? + load_value=$(timeout 10s ssh ${tester}.tcwglab docker ps | wc -l) || ret=$? if [ $ret -eq 0 ]; then if [ "$load_value" -lt "$tester_min_load_value" ]; then tester_min_load_name=$tester diff --git a/start-container-qemu.sh b/start-container-qemu.sh index 233b8ae1..4f26fde0 100755 --- a/start-container-qemu.sh +++ b/start-container-qemu.sh @@ -56,7 +56,7 @@ nfsroot="/tmp/nfsroot" container_exec sudo mkdir "$nfsroot" container_exec sudo rsync -a --one-file-system / $nfsroot/ -nfsip=$(ssh $host docker -H :2375 inspect --format {{.NetworkSettings.IPAddress}} "$container_id") +nfsip=$(ssh $host docker inspect --format {{.NetworkSettings.IPAddress}} "$container_id") # Start NFS server inside container. # Note, for NFS server to work inside container kernel should have @@ -112,7 +112,7 @@ remote_exec "$host:$port:/:-f -Snone" \ -device virtio-net-device,netdev=unet \ -s > ${prefix}qemu.log 2>&1 -qemu_port=$(ssh $host docker -H :2375 port $container_id 2222 | cut -d: -f 2) +qemu_port=$(ssh $host docker port $container_id 2222 | cut -d: -f 2) ret=0 wait_for_ssh_server $host $qemu_port || ret=$? diff --git a/tcwg-cleanup-stale-containers.sh b/tcwg-cleanup-stale-containers.sh index 03281dc0..86fc04b8 100755 --- a/tcwg-cleanup-stale-containers.sh +++ b/tcwg-cleanup-stale-containers.sh @@ -58,7 +58,7 @@ if $verbose; then set -x fi -DOCKER="docker -H :2375" +DOCKER="docker" do_cleanup_containers () { |