-
Notifications
You must be signed in to change notification settings - Fork 673
Automatically symlink /var/run/*.sock sockets to /var/run/weave/*.sock #1696
Conversation
…proxy-mount-h"" This reverts commit 7987d09.
Avoids the obscure warning for users
f199dbe
to
af7e500
Compare
weave_on $HOST1 stop | ||
weave_on $HOST1 launch-proxy -H unix:///var/run/weave/weave.sock | ||
assert_raises 'run_on '$HOST1' "eval $(weave env) ; docker '$CMD'"' | ||
assert_raises 'run_on '$HOST1' "docker $(weave config) '$CMD'"' |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
af7e500
to
77bc22b
Compare
@@ -1552,6 +1571,9 @@ launch_proxy() { | |||
--entrypoint=/home/weave/weaveproxy \ | |||
$WEAVEPROXY_DOCKER_ARGS $EXEC_IMAGE $COVERAGE_ARGS $PROXY_ARGS) | |||
wait_for_status $PROXY_CONTAINER_NAME http_call_unix $PROXY_CONTAINER_NAME status.sock | |||
for sock in $PROXY_VAR_RUN_SYMLINKS; do | |||
ln -sf -T "/var/run/weave/$sock" "/host/var/run/$sock" |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
Can you think of any compelling reasons why we would choose option 2? I think I prefer option 1. |
Option 2 makes for more consistent handling of unix sockets. It means we're not special-casing sockets in |
Ok, test is failing because docker unix socket is only accessible to root:docker on gce. |
5c75f2c
to
33648b0
Compare
Another idea - how about having the weave script symlink all |
If someone does
would they find the path returned by this
surprising? |
Their level of surprise probably depends on what they expected it to return. Edit: Just actually read the result, yeah that's probably not right. |
Automatically symlink /var/run/*.sock sockets to /var/run/weave/*.sock
Uses approach 1 to fix #1694
Comments on approach vs 2, would be great.