From 7abed164ebb541939c85044af6691cd7db937607 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jun 2016 16:11:01 +0100 Subject: [PATCH 1/4] Clean up reference to 'above' --- site/weavedns/managing-domains-weavedns.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/site/weavedns/managing-domains-weavedns.md b/site/weavedns/managing-domains-weavedns.md index 758a2415..85fa895b 100644 --- a/site/weavedns/managing-domains-weavedns.md +++ b/site/weavedns/managing-domains-weavedns.md @@ -10,12 +10,10 @@ The following topics are discussed: ## Configuring the domain search paths -If you don't supply a domain search path (with `--dns-search=`), -`weave run ...` tells a container to look for "bare" hostnames, like -`pingme`, in its own domain (or in `weave.local` if it has no domain). -That's why you can just invoke `ping pingme` above -- since the -hostname is `ubuntu.weave.local`, it will look for -`pingme.weave.local`. +If you don't supply a domain search path (with `--dns-search=`), Weave +Net (via the [proxy](/site/weave-docker-api.md) or via `weave run`) +tells a container to look for "bare" hostnames, like `pingme`, in its +own domain (or in `weave.local` if it has no domain). If you want to supply other entries for the domain search path, e.g. if you want containers in different sub-domains to resolve From e9770740d8f622e8d34e8386e9712c480d05707f Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jun 2016 16:12:42 +0100 Subject: [PATCH 2/4] Use short name rather than long hex ID --- site/weave-docker-api/using-proxy.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md index cbccc57e..264ceb6a 100644 --- a/site/weave-docker-api/using-proxy.md +++ b/site/weave-docker-api/using-proxy.md @@ -20,9 +20,8 @@ To create and start a container via the Weave Net proxy run: or, equivalently run: - host1$ docker create -ti ubuntu - 5ef831df61d50a1a49272357155a976595e7268e590f0a2c75693337b14e1382 - host1$ docker start 5ef831df61d50a1a49272357155a976595e7268e590f0a2c75693337b14e1382 + host1$ docker create -ti --name=foo ubuntu + host1$ docker start foo Specific IP addresses and networks can be supplied in the `WEAVE_CIDR` environment variable, for example: From b993fd67ab58d31ab6074d406c390bceb8464197 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jun 2016 16:43:37 +0100 Subject: [PATCH 3/4] Describe creating multiple networks using the plugin --- site/plugin.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/site/plugin.md b/site/plugin.md index c9f7fa3f..0f63202a 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -56,6 +56,30 @@ then run your containers using the Docker command-line: 64 bytes from 10.32.0.2: icmp_seq=2 ttl=64 time=0.052 ms +###Creating multiple Docker Networks + +Docker lets you create multiple independent networks and attach +different sets of containers to each network. However, to coordinate +this between hosts Docker requires that you configure a +["key-value store](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#step-1-set-up-a-key-value-store). + +If your Docker installation has a key-value store, you can create a +network based on Weave Net like this: + + $ docker network create --driver=weave mynetwork + +then use it to connect a container: + + $ docker run --net=mynetwork ... + +or + + $ docker network connect mynetwork somecontainer + +Containers attached to different Docker Networks are +[isolated through subnets](https://www.weave.works/docs/net/latest/using-weave/application-isolation/). + + ###Restarting the Plugin The plugin, like all Weave Net components, is started with a policy of `--restart=always`, so that it is always there after a restart or reboot. If you remove this container (for example, when using `weave reset`) before removing all endpoints created using `--net=weave`, Docker may hang for a long time when it subsequently tries to re-establish communications to the plugin. From fdf3afa935edbab8f7f4a6023ecd396759dcd754 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 15 Jun 2016 11:10:13 +0100 Subject: [PATCH 4/4] Review feedback --- site/plugin.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/plugin.md b/site/plugin.md index 0f63202a..04488722 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -58,13 +58,13 @@ then run your containers using the Docker command-line: ###Creating multiple Docker Networks -Docker lets you create multiple independent networks and attach -different sets of containers to each network. However, to coordinate -this between hosts Docker requires that you configure a -["key-value store](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#step-1-set-up-a-key-value-store). +Docker enables you to create multiple independent networks and attach +different sets of containers to each network. However, coordinating +this between hosts, Docker requires that you configure a +["key-value store"](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#step-1-set-up-a-key-value-store). -If your Docker installation has a key-value store, you can create a -network based on Weave Net like this: +If your Docker installation has a key-value store, create a network +based on Weave Net as follows: $ docker network create --driver=weave mynetwork