Skip to content

Commit

Permalink
remove the -D proxy option from the docs
Browse files Browse the repository at this point in the history
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.

Also remove dangling reference to 'localhost', and move note about
firwalls to where it is most pertinent.

Part fix to weaveworks#972.
  • Loading branch information
rade committed Jun 22, 2015
1 parent 403b965 commit 56c720b
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions site/proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,14 @@ To start the proxy, run

host1$ weave launch-proxy

By default, the proxy will connect to docker at
`unix:///var/run/docker.sock`. This can be adjusted with the `-D`
argument, e.g.

host1$ weave launch-proxy -D tcp://127.0.0.1:4243

By default, the proxy listens on port 12375, on all network
interfaces. This can be adjusted with the `-H` argument, e.g.

host1$ weave launch-proxy -H tcp://127.0.0.1:9999

If you are working with a remote docker daemon, then any firewalls
inbetween need to be configured to permit access to the proxy port.

All docker commands can be run via the proxy, so it is safe to adjust
your `DOCKER_HOST` to point at the proxy. Weave provides a convenient
command for this:
Expand All @@ -52,11 +49,6 @@ Alternatively, the proxy host can be set on a per-command basis with

host1$ docker $(weave proxy-config) ps

If you are working with a remote docker daemon, then `localhost` in
the above needs to be replaced with the docker daemon host, and any
firewalls inbetween need to be configured to permit access to
the proxy port.

The proxy can be stopped with

host1$ weave stop-proxy
Expand Down

0 comments on commit 56c720b

Please sign in to comment.