Make proxy listen on unix:///var/run/weave.sock #1026

tomwilkie · 2015-06-26T12:22:23Z

proxy still listens on 0.0.0.0; can now listen on multiple endpoints
bind mounts /var/run instead of /var/run/docker.sock so the host can see the proxy sock.
copies owner & permissions from /var/run/docker.sock to /var/run/weave.sock

weave

@@ -921,8 +921,8 @@ proxy_args() {
 }

 proxy_addr() {
-    if addr=$(docker logs $PROXY_CONTAINER_NAME 2>/dev/null | head -n3 | grep -oE "proxy listening on .*"); then
-      addr=${addr##* }
+    if addr=$(docker logs $PROXY_CONTAINER_NAME 2>/dev/null | grep -oE "proxy listening on .*" | head -n1); then


rade · 2015-06-26T12:31:47Z

Need to update the weave usage. And the proxy docs.

weave

-    if addr=$(docker logs $PROXY_CONTAINER_NAME 2>/dev/null | head -n3 | grep -oE "proxy listening on .*"); then
-      addr=${addr##* }
+    if addr=$(docker logs $PROXY_CONTAINER_NAME 2>/dev/null | grep -oE "proxy listening on .*" | head -n1); then
+      addr=${addr##* tcp://}


proxy/proxy.go

+	errs := make(chan error)
+	for _, addr := range proxy.ListenAddrs {
+		Info.Println("proxy listening on", addr)
+	}


rade · 2015-06-26T13:16:35Z

Neither the docs nor the usage mention that multiple -H can be specified.

weave

-      port=${addr#*:}
-      echo "${1}tcp://${host:-$PROXY_HOST}:${port:-$PROXY_PORT}"
+      addr=$(echo ${addr} | sed "s/0.0.0.0/$PROXY_HOST/g")
+      echo "${1}${addr}"


Make proxy listen on unix:///var/run/weave.sock Closes #1003

rade reviewed Jun 26, 2015
View reviewed changes

rade assigned tomwilkie Jun 26, 2015

rade reviewed Jun 26, 2015
View reviewed changes

tomwilkie force-pushed the 1003-proxy-unix-socket branch from f132eac to 10f5b76 Compare June 26, 2015 12:51

tomwilkie assigned rade and unassigned tomwilkie Jun 26, 2015

rade reviewed Jun 26, 2015
View reviewed changes

proxy/proxy.go

errs := make(chan error)

for _, addr := range proxy.ListenAddrs {

Info.Println("proxy listening on", addr)

}

This comment was marked as abuse.

Sign in to view

rade assigned tomwilkie and unassigned rade Jun 26, 2015

tomwilkie force-pushed the 1003-proxy-unix-socket branch 3 times, most recently from 5e039b0 to eeae40e Compare June 26, 2015 14:03

rade assigned rade and unassigned tomwilkie Jun 26, 2015

tomwilkie force-pushed the 1003-proxy-unix-socket branch from eeae40e to f4db095 Compare June 26, 2015 14:43

rade reviewed Jun 26, 2015
View reviewed changes

weave

port=${addr#*:}

echo "${1}tcp://${host:-$PROXY_HOST}:${port:-$PROXY_PORT}"

addr=$(echo ${addr} | sed "s/0.0.0.0/$PROXY_HOST/g")

echo "${1}${addr}"

This comment was marked as abuse.

Sign in to view

Make proxy listen on /var/run/weave.sock

c4565f6

tomwilkie force-pushed the 1003-proxy-unix-socket branch from f4db095 to c4565f6 Compare June 26, 2015 15:08

rade added a commit that referenced this pull request Jun 26, 2015

Merge pull request #1026 from weaveworks/1003-proxy-unix-socket

906ff21

Make proxy listen on unix:///var/run/weave.sock Closes #1003

rade merged commit 906ff21 into master Jun 26, 2015

rade deleted the 1003-proxy-unix-socket branch June 26, 2015 15:44

rade modified the milestone: 1.1.0 Jul 2, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make proxy listen on unix:///var/run/weave.sock #1026

Make proxy listen on unix:///var/run/weave.sock #1026

tomwilkie commented Jun 26, 2015

This comment was marked as abuse.

rade commented Jun 26, 2015

This comment was marked as abuse.

This comment was marked as abuse.

rade commented Jun 26, 2015

This comment was marked as abuse.

Make proxy listen on unix:///var/run/weave.sock #1026

Make proxy listen on unix:///var/run/weave.sock #1026

Conversation

tomwilkie commented Jun 26, 2015

This comment was marked as abuse.

rade commented Jun 26, 2015

This comment was marked as abuse.

This comment was marked as abuse.

rade commented Jun 26, 2015

This comment was marked as abuse.