Paul Bellamy
e4458372e8
Adds a --no-rewrite-hosts flag to the proxy, and be default, removes the docker IP from hosts. We only discard the docker host when it exists, so --net=none works.
26 lines
959 B
Bash
Executable File
26 lines
959 B
Bash
Executable File
#! /bin/bash
|
|
|
|
. ./config.sh
|
|
|
|
entrypoint() {
|
|
docker_on $HOST1 inspect --format="{{.Config.Entrypoint}}" "$@"
|
|
}
|
|
|
|
start_suite "Proxy waits for weave to be ready before running container commands"
|
|
weave_on $HOST1 launch-proxy
|
|
BASE_IMAGE=busybox
|
|
# Ensure the base image does not exist, so that it will be pulled
|
|
! docker_on $HOST1 inspect --format=" " $BASE_IMAGE >/dev/null 2>&1 || docker_on $HOST1 rmi $BASE_IMAGE
|
|
|
|
assert_raises "proxy docker_on $HOST1 run --name c1 -e 'WEAVE_CIDR=10.2.1.1/24' $BASE_IMAGE $CHECK_ETHWE_UP"
|
|
|
|
# Check committed containers only have one weavewait prepended
|
|
COMMITTED_IMAGE=$(proxy docker_on $HOST1 commit c1)
|
|
assert_raises "proxy docker_on $HOST1 run --name c2 $COMMITTED_IMAGE"
|
|
assert "entrypoint c2" "$(entrypoint $COMMITTED_IMAGE)"
|
|
|
|
# Check weave IP is first ip returned, so java (etc) prefer weave.
|
|
assert "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' $BASE_IMAGE hostname -i | cut -d' ' -f1" "10.2.1.1"
|
|
|
|
end_suite
|