From 5c8f6175b5fb30a26403b925d1c72dd2b334cec5 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 2 Aug 2016 12:34:52 -0500 Subject: [PATCH] added note about net flag --- site/weave-docker-api.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/site/weave-docker-api.md b/site/weave-docker-api.md index 179948b0..fb98ec26 100644 --- a/site/weave-docker-api.md +++ b/site/weave-docker-api.md @@ -10,6 +10,21 @@ network when they are started using the ordinary Docker or the [remote API](https://docs.docker.com/reference/api/docker_remote_api/), instead of `weave run`. +###Attaching Containers to a Weave Network + +There are two ways to attach containers to a Weave network, +the first uses the Weave Net Docker API Proxy, and is described in this section. +The other method uses the Docker network plugin framework. It’s your choice which method to use. + +To use the Docker Network Plugin launch Weave with the --net flag. Note that once +you’ve launched Weave with this flag the Proxy is automatically disabled. + +For more information about using the Network Plugin, see +[Integrating Docker via the Network Plugin](plugin.md). + +For more information about using the Weave Docker +API proxy then read on. + ###Setting Up The Weave Net Docker API Proxy