reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1569 from weaveworks/issues/1565-docker-1.9.0-workaround

Browse Source 
Reorder inspect template to work around docker/docker#17026

Fixes #1565.
This commit is contained in:
Matthias Radestock committed 2015-10-21 15:29:59 +01:00
2 parents 674c617c16 40922b88f7
commit 98b47f866b
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
test/666_abuse_of_start_test.sh
+1 -1
View File
@@ -10,7 +10,7 @@ proxy_start_container $HOST1 --name=c1
check_hostconfig() {
docker_on $HOST1 attach c2 >/dev/null 2>&1 || true # Wait for container to exit
assert "docker_on $HOST1 inspect -f '{{.HostConfig.NetworkMode}} {{.State.Running}} {{.State.ExitCode}} {{.HostConfig.Dns}}' $1" "$2 false 0 [$docker_bridge_ip]"
assert "docker_on $HOST1 inspect -f '{{.HostConfig.Dns}} {{.HostConfig.NetworkMode}} {{.State.Running}} {{.State.ExitCode}}' $1" "[$docker_bridge_ip] $2 false 0"
}
# Start c2 with a sneaky HostConfig