From 71d6f9cdfbb43a60116962edc09876402dfedf90 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Mon, 1 Jun 2015 13:23:23 +0100 Subject: [PATCH 1/2] [docs] re-ordering proxy doc sections --- site/proxy.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/site/proxy.md b/site/proxy.md index 27bca6c8..a7e06981 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -56,21 +56,6 @@ Multiple IP addresses and networks can be supplied in the `WEAVE_CIDR` variable by space-separating them, as in `WEAVE_CIDR="10.2.1.1/24 10.2.2.1/24"`. -## Usage with WeaveDNS - -Containers started via the proxy can be automatically configured to -use WeaveDNS for name resolution. To accomplish this we need to launch -the proxy with the `--with-dns` option - - host1$ weave launch - 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). - ## Usage with IPAM To automatically assign a unique IP address to a container, weave must @@ -94,6 +79,21 @@ option. For example: More details on IPAM can be found in the [IPAM documentation](ipam.html). +## Usage with WeaveDNS + +Containers started via the proxy can be automatically configured to +use WeaveDNS for name resolution. To accomplish this we need to launch +the proxy with the `--with-dns` option + + host1$ weave launch + 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). + ## Limitations * The proxy does not currently support TLS. From 6feaa72abde94721a7b490dfe05289124c338b26 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Mon, 1 Jun 2015 13:24:39 +0100 Subject: [PATCH 2/2] [docs] elaborating on proxy IPAM and DNS interaction --- site/proxy.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) 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