When container is started in host (or container) networkMode, we mount a noop weavewait, so it can continue
review feedback
This commit is contained in:
1 parent
77c7963bde
commit
ec5a1a3977
12 files changed
+106
-42
No files matched your search
@@ -9,8 +9,8 @@ docker_bridge_ip=$(weave_on $HOST1 docker-bridge-ip)
|
||||
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.Dns}} {{.HostConfig.NetworkMode}} {{.State.Running}} {{.State.ExitCode}}' $1" "[$docker_bridge_ip] $2 false 0"
|
||||
docker_on $HOST1 attach $1 >/dev/null 2>&1 || true # Wait for container to exit
|
||||
assert "docker_on $HOST1 inspect -f '{{.HostConfig.Dns}} {{.HostConfig.NetworkMode}} {{.State.Running}} {{.State.ExitCode}}' $1" "[$3] $2 false 0"
|
||||
}
|
||||
|
||||
# Start c2 with a sneaky HostConfig
|
||||
@@ -26,7 +26,7 @@ check_hostconfig c5 container:c1
|
||||
# Start c3 with HostConfig having empty binds and null dns/networking settings
|
||||
proxy docker_on $HOST1 create --name=c3 -v /tmp:/hosttmp $SMALL_IMAGE $CHECK_ETHWE_UP
|
||||
proxy docker_api_on $HOST1 POST /containers/c3/start '{"Binds":[],"Dns":null,"DnsSearch":null,"ExtraHosts":null,"VolumesFrom":null,"Devices":null,"NetworkMode":""}'
|
||||
check_hostconfig c3 default
|
||||
check_hostconfig c3 default $docker_bridge_ip
|
||||
|
||||
# Start c4 with an 'null' HostConfig and check this doesn't remove previous parameters
|
||||
proxy docker_on $HOST1 create --name=c4 --memory-swap -1 $SMALL_IMAGE echo foo
|
||||
@@ -42,6 +42,17 @@ check_hostconfig c6 container:c1
|
||||
proxy docker_on $HOST1 create --name=c7 --memory-swap -1 $SMALL_IMAGE $CHECK_ETHWE_UP
|
||||
proxy docker_api_on $HOST1 POST /containers/c7/start '{"HostConfig":{}}'
|
||||
assert "docker_on $HOST1 inspect -f '{{.HostConfig.MemorySwap}}' c7" "0"
|
||||
check_hostconfig c7 default
|
||||
check_hostconfig c7 default $docker_bridge_ip
|
||||
|
||||
# Start c8 in host network mode
|
||||
proxy docker_on $HOST1 create --name=c8 $SMALL_IMAGE $CHECK_ETHWE_MISSING
|
||||
proxy docker_api_on $HOST1 POST /containers/c8/start '{"HostConfig": {"NetworkMode": "host"}}'
|
||||
check_hostconfig c8 host
|
||||
|
||||
# Start c10 in network of host container
|
||||
proxy_start_container $HOST1 --name=c9 --net=host
|
||||
proxy docker_on $HOST1 create --name=c10 $SMALL_IMAGE $CHECK_ETHWE_MISSING
|
||||
proxy docker_api_on $HOST1 POST /containers/c10/start '{"HostConfig": {"NetworkMode": "container:c9"}}'
|
||||
check_hostconfig c10 container:c9
|
||||
|
||||
end_suite
|
||||
@@ -40,6 +40,7 @@ TEST_IMAGES="$SMALL_IMAGE $DNS_IMAGE"
|
||||
|
||||
PING="ping -nq -W 1 -c 1"
|
||||
CHECK_ETHWE_UP="grep ^1$ /sys/class/net/ethwe/carrier"
|
||||
CHECK_ETHWE_MISSING="test ! -d /sys/class/net/ethwe"
|
||||
|
||||
DOCKER_PORT=2375
|
||||
|
||||
|
||||
Reference in new issue
Block a user