Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

[proxy] Symlink sockets to /var/run/weave/weave.sock from inside the proxy#1740

Merged
awh merged 4 commits intomasterfrom
1694-symlink-into-var-run-2
Dec 2, 2015
Merged

[proxy] Symlink sockets to /var/run/weave/weave.sock from inside the proxy#1740
awh merged 4 commits intomasterfrom
1694-symlink-into-var-run-2

Conversation

@paulbellamy
Copy link
Contributor

Needs an in-depth review, please.

We copy docker.sock owner to symlinks. Permissions are not copied,
because the permissions will inherit from the target.

Fixes #1694, using option 2 (having the proxy create the symlinks). If the weave script creates the symlinks, weave env would break (unless we passed the symlinks in, and that's awkward).

There is a slight change in behaviour of weave env. New order of preference is: tcp sockets, custom unix sockets, then /var/run/weave/weave.sock.

Most of the awkwardness/code in this is just to run a docker container. 😞

Happy to refactor, any suggestions on ways to clean up the code would be great.

…proxy

We copy docker.sock owner to symlinks. Permissions are not copied,
because the permissions will inherit from the target.

use versioned exec image to create symlinks
@awh awh self-assigned this Dec 1, 2015
@awh awh added this to the 1.4.0 milestone Dec 1, 2015
proxy/proxy.go Outdated

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

@paulbellamy paulbellamy force-pushed the 1694-symlink-into-var-run-2 branch from 4a4a91d to ac1cf63 Compare December 1, 2015 16:16
awh added a commit that referenced this pull request Dec 2, 2015
Symlink sockets to /var/run/weave/weave.sock from inside the proxy
@awh awh merged commit 1f438db into master Dec 2, 2015
@awh awh deleted the 1694-symlink-into-var-run-2 branch December 2, 2015 14:13
@bboreham
Copy link
Contributor

Does this fix #1579 ?

@paulbellamy
Copy link
Contributor Author

I believe so, yes.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants