diff --git a/site/proxy.md b/site/proxy.md index a7e06981..57914dab 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -76,8 +76,15 @@ without a `WEAVE_CIDR`, we can launch the proxy with the `--with-ipam` option. For example: host1$ weave launch-proxy --with-ipam + host1$ export DOCKER_HOST=tcp://host1:12375 -More details on IPAM can be found in the [IPAM documentation](ipam.html). +Now, containers will always be automatically assigned an IP address +and attached to the weave network when we start them. For example: + + host1$ docker run -ti ubuntu /bin/sh + +More details on IPAM can be found in the [IPAM +documentation](ipam.html). ## Usage with WeaveDNS @@ -89,10 +96,11 @@ the proxy with the `--with-dns` option host1$ weave launch-dns 10.2.254.1/24 host1$ weave launch-proxy --with-dns -With this done, any containers launched through the proxy will use -weaveDNS for name resolution. WeaveDNS is used in addition to any dns -servers specified via the `--dns` option. More details on weaveDNS can -be found in the [weaveDNS documentation](weavedns.html). +With this done, any containers connected via IPAM or `WEAVE_CIDR=...`, +which are launched through the proxy will use weaveDNS for name +resolution. WeaveDNS is used in addition to any dns servers specified +via the `--dns` option. More details on weaveDNS can be found in the +[weaveDNS documentation](weavedns.html). ## Limitations