[proxy] weavewait rewrites /etc/hosts so weave ip is returned first from 'hostname -i'

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.
This commit is contained in:
Paul Bellamy committed 2015-07-10 13:57:20 +01:00
1 parent 75646d4786
commit e4458372e8
6 files changed
+121 -12

No files matched your search

+3
View File
@@ -19,4 +19,7 @@ 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