From c9409c53422fd970af13b9265df95f38f9ae7853 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Wed, 20 May 2015 14:10:50 +0100 Subject: [PATCH] [proxy] Adding basic docs about IPAM integration --- site/proxy.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/site/proxy.md b/site/proxy.md index c1d0daa0..5ab679ff 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -22,7 +22,7 @@ and listen on port 12375. However, we can adjust the connection to docker via the `-H` argument. All docker commands can be run via the proxy, so it is safe to globally adjust your `DOCKER_HOST`. - host1$ export DOCKER_HOST="tcp://host1:12375" + host1$ export DOCKER_HOST=tcp://host1:12375 host1$ docker ps ## Usage @@ -53,6 +53,20 @@ Containers started via the proxy can be automatically configured to use WeaveDNS 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 be told on startup what range of addresses to allocate from. For example: + + host1# weave launch -iprange 10.2.3.0/24 + host1$ weave launch-proxy + host1$ export DOCKER_HOST=tcp://host1:12375 + +With this done, we can automtaically assign an address to a container by providing a blank `WEAVE_CIDR` value, as in + + host1$ docker run -e WEAVE_CIDR= -ti ubuntu /bin/sh + +More details on IPAM can be found in the [IPAM documentstion](ipam.html). + ## Limitations * The proxy does not currently support TLS.