Merge pull request #949 from paulbellamy/939-proxy-env-bug

remove spurious output from proxy-(env|config)

Fixes #939.
This commit is contained in:
Matthias Radestock committed 2015-06-17 12:10:09 +01:00
commit c45b586a44
1 file changed
+1 -1
+1 -1
View File
@@ -892,7 +892,7 @@ proxy_args() {
}
proxy_addr() {
if addr=$(docker logs weaveproxy | head -n3 | grep -oE "proxy listening on .*"); then
if addr=$(docker logs $PROXY_CONTAINER_NAME 2>/dev/null | head -n3 | grep -oE "proxy listening on .*"); then
addr=${addr##* }
host=${addr%:*}
[ "$host" = "0.0.0.0" ] && host=$PROXY_HOST