Update docs following merge of proxy & router.

Notes:
- Deleted trailing whitespaces on modified files.
- Added documentation for launch --proxy=false.
This commit is contained in:
Marc CARRE committed 2017-05-16 08:57:17 +01:00
1 parent cb614f01c3
commit cbf1230f6d
7 files changed
+49 -47

No files matched your search

+14 -7
View File
@@ -5,13 +5,13 @@ search_type: Documentation
---
When containers are created via the Weave Net proxy, their entrypoint is
When containers are created via the Weave Net proxy, their entrypoint is
modified to wait for the Weave network interface to become
available.
available.
When they are started via the Weave Net proxy, containers are
When they are started via the Weave Net proxy, containers are
[automatically assigned IP addresses](/site/ipam.md) and connected to the
Weave network.
Weave network.
### Creating and Starting Containers with the Weave Net Proxy
@@ -39,19 +39,19 @@ variable by space-separating them, as in
The Docker NetworkSettings (including IP address, MacAddress, and
IPPrefixLen), are still returned when `docker inspect` is run. If you want
`docker inspect` to return the Weave NetworkSettings instead, then the
proxy must be launched using the `--rewrite-inspect` flag.
proxy must be launched using the `--rewrite-inspect` flag.
This command substitutes the Weave network settings when the container has a
Weave Net IP. If a container has more than one Weave Net IP, then the inspect call
only includes one of them.
host1$ weave launch-router && weave launch-proxy --rewrite-inspect
host1$ weave launch --rewrite-inspect
### Multicast Traffic and Launching the Weave Proxy
By default, multicast traffic is routed over the Weave network.
To turn this off, for example, because you want to configure your own multicast
route, add the `--no-multicast-route` flag to `weave launch-proxy`.
route, add the `--no-multicast-route` flag to `weave launch`.
### Other Weave Proxy options
@@ -61,6 +61,13 @@ route, add the `--no-multicast-route` flag to `weave launch-proxy`.
* `--no-restart` -- remove the default policy of `--restart=always`, if
you want to control start-up of the proxy yourself
### Disabling Weave Proxy
If for some reason you need to disable the proxy, but still want to start other Weave Net components (router, weaveDNS), you can do so using:
weave launch --proxy=false
**See Also**
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)