[proxy] Add support for WEAVE_CIDR=none

Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
This commit is contained in:
Paul Bellamy committed 2015-06-17 14:51:12 +01:00
1 parent ff838a14d9
commit ca681bce13
8 files changed
+44 -15

No files matched your search

+7 -2
View File
@@ -109,8 +109,13 @@ To use a specific IP, we pass a `WEAVE_CIDR` to the container, e.g.
host1$ docker run -ti -e WEAVE_CIDR=10.2.1.1/24 ubuntu
To start containers without connecting them to the weave network, the
proxy needs to be passed the `--no-default-ipam` flag, e.g.
To start a container without connecting it to the weave network, pass
`WEAVE_CIDR=none`, e.g.
host1$ docker run -ti -e WEAVE_CIDR=none ubuntu
If you do not want IPAM to be used by default, the proxy needs to be
passed the `--no-default-ipam` flag, e.g.
host1$ docker launch-proxy --no-default-ipam