From dea1405d7179c8f810c7a9ed4fdef90d58e7fcae Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Thu, 15 Oct 2015 14:39:56 +0100 Subject: [PATCH] Remove hardcoded docker bridge IP from proxy test --- test/600_proxy_docker_py.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh index f03d9103..0da08fbe 100755 --- a/test/600_proxy_docker_py.sh +++ b/test/600_proxy_docker_py.sh @@ -29,9 +29,11 @@ docker_py_test() { weave_on $HOST1 launch-proxy --no-default-ipalloc + DOCKER_BRIDGE_IP=$(weave_on $HOST1 docker-bridge-ip) + if docker_on $HOST1 run \ -e NOT_ON_HOST=true \ - -e DOCKER_HOST=tcp://172.17.42.1:12375 \ + -e DOCKER_HOST=tcp://$DOCKER_BRIDGE_IP:12375 \ -v /tmp:/tmp \ -v /var/run/docker.sock:/var/run/docker.sock \ joffrey/docker-py py.test $TESTS ; then