From 4f0f3cf98d03b638cdf120bb380bb9a56a442646 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 22 Feb 2016 13:53:39 +0000 Subject: [PATCH] warn against using the plugin in combination with --net=weave and expand the basic proxy usage docs slightly. --- site/features.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/site/features.md b/site/features.md index aaa1a43c..e032f604 100644 --- a/site/features.md +++ b/site/features.md @@ -87,7 +87,12 @@ launched via the Docker [command-line interface](https://docs.docker.com/reference/commandline/cli/) or [remote API](https://docs.docker.com/reference/api/docker_remote_api/) -are attached to the weave network before they begin execution. +are attached to the weave network before they begin execution. To use +the proxy, run + + $ eval $(weave env) + +and then start containers as usual. Containers started in this way that subsequently restart, either by an explicit `docker restart` command or by Docker restart policy, are @@ -100,6 +105,9 @@ named `weave` is created by `weave launch`, which you can use like this: $ docker run --net=weave -ti ubuntu +> NB: The plugin is an *alternative* to the proxy, hence one should +> *not* run `eval $(weave env)` beforehand. + For more details see the [plugin documentation](plugin.html). ### Address allocation