From 1d9ef76080116194c904420b4a4adf639d2ca9cc Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sat, 12 Dec 2015 13:56:54 +0000 Subject: [PATCH 1/3] Remove mention of --with-dns option; see #1748 and #1754 --- site/weavedns.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/site/weavedns.md b/site/weavedns.md index e3da2fcc..5b9458f5 100644 --- a/site/weavedns.md +++ b/site/weavedns.md @@ -55,9 +55,8 @@ root@ubuntu:/# ping pingme > the hostname is not in the weaveDNS domain the container will *not* > be registered, but will still use weaveDNS for resolution. -It is also possible to force or forbid an application container's use -of weaveDNS with the `--with-dns` and `--without-dns` options to -`weave run` and `weave launch-proxy`. +To disable application containers' use of weaveDNS, add the +`--without-dns` option to `weave run` or `weave launch-proxy`. ## How it works @@ -100,7 +99,7 @@ In the event that weaveDNS is launched in this way, it's important that other calls to `weave` also specify the bridge device: ```bash -$ sudo DOCKER_BRIDGE=someother weave run --with-dns ... +$ sudo DOCKER_BRIDGE=someother weave run ... ``` ## Load balancing From db5ba61915fe5e3ec3b07c038683d29891e17cc1 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 17 Dec 2015 11:41:44 +0000 Subject: [PATCH 2/3] Improve formatting --- site/plugin.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site/plugin.md b/site/plugin.md index 21e18821..a45a8586 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -3,6 +3,8 @@ title: Using Weave Net via Docker Networking layout: default --- +# Weave Plugin + New in Docker version 1.9 is a plugin mechanism to add different network providers. @@ -18,11 +20,11 @@ you remove this container (e.g. using `weave reset`) before removing all endpoints created using `--net=weave`, Docker can [hang](https://github.com/docker/libnetwork/issues/813). -## Starting a container: +## Starting a container $ docker run --net=weave -ti ubuntu -## Using WeaveDNS for Service Discovery: +## Using WeaveDNS for Service Discovery You need to pass the additional arguments `--dns` and `-dns-search`, for which we provide a helper in the weave script: From 1ce0df4e9490889f5bf5e47bb68273072049cf55 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 17 Dec 2015 11:42:41 +0000 Subject: [PATCH 3/3] Explain multiple networks --- site/plugin.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/site/plugin.md b/site/plugin.md index a45a8586..27377c76 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -48,6 +48,11 @@ store](#cluster-store) (like Docker's overlay driver) and one named * Supports only a single network (we create one named `weave` for you automatically) * Uses Weave's partition tolerant IPAM +If you do create additional networks using the `weavemesh` driver, +containers attached to them will be able to communicate with +containers attached to `weave`; there is no isolation between those +networks. + ### `weave` driver * This runs in what Docker call "global scope"; requires a cluster store @@ -58,7 +63,7 @@ There's no specific documentation from Docker on using a cluster store, but the first part of [Getting Started with Docker Multi-host Networking][docker-net] should point the way. -Note that in the case of multiple docker networks, all containers are +Note that in the case of multiple networks using the `weave` driver, all containers are on the same virtual network but Docker allocates their addresses on different subnets so they cannot talk to each other directly.