From bd94c00e9653200f00bde464998342864e7859a0 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Mon, 1 Jun 2015 11:22:38 +0100 Subject: [PATCH] weave PROXY_HOST is always localhost, so just hardcode it as that Because launch-proxy runs in weaveexec container, DOCKER_HOST is never set. --- weave | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/weave b/weave index 7a98e015..f8cbf031 100755 --- a/weave +++ b/weave @@ -171,10 +171,6 @@ HTTP_PORT=6784 DNS_HTTP_PORT=6785 PROXY_PORT=12375 PROXY_CONTAINER_NAME=weaveproxy -PROXY_HOST="localhost" -if [ "$DOCKER_HOST" != "${DOCKER_HOST#tcp://}" ] ; then - PROXY_HOST=$(echo "$DOCKER_HOST" | sed -e "s|tcp://\([^:]*\):[0-9]*|\1|") -fi ###################################################################### @@ -868,7 +864,7 @@ case "$COMMAND" in $WEAVEPROXY_DOCKER_ARGS \ $EXEC_IMAGE "$@") - wait_for_status_ip $PROXY_HOST $PROXY_PORT + wait_for_status_ip 127.0.0.1 $PROXY_PORT echo $PROXY_CONTAINER ;; connect)