From b78d4f05d01cd2a9656a372f38988bb7e99e5f30 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Thu, 25 Jun 2015 14:39:52 +0100 Subject: [PATCH 1/3] Use new `weave launch` command introduced by #962 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 37392793..1c430ec3 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ two containers, one on each host. First start weave on $HOST1: - host1$ weave launch && weave launch-dns && weave launch-proxy + host1$ weave launch this runs the weave router, DNS and proxy, each in their own container. Next we configure our `DOCKER_HOST` environment variable to @@ -81,7 +81,7 @@ this host we simply launch them with `docker run` as appropriate. Next we repeat similar steps on `$HOST2`... - host2$ weave launch $HOST1 && weave launch-dns && weave launch-proxy + host2$ weave launch $HOST1 host2$ eval $(weave proxy-env) host2$ docker run --name a2 -ti ubuntu From 99dc70ea7a0d47674d6273daf0e11d83dfc344d1 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Thu, 25 Jun 2015 15:18:29 +0100 Subject: [PATCH 2/3] Eliminate references to proxy and weaveDNS --- README.md | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 1c430ec3..5ac4884d 100644 --- a/README.md +++ b/README.md @@ -64,15 +64,12 @@ First start weave on $HOST1: host1$ weave launch -this runs the weave router, DNS and proxy, each in their own -container. Next we configure our `DOCKER_HOST` environment variable to -point to the proxy, so that containers launched via the docker command -line are automatically attached to the weave network: +Next we configure our environment so that containers launched via the +docker command line are automatically attached to the weave network: host1$ eval $(weave proxy-env) -Finally we run our application container; this happens via the proxy -so it is automatically allocated an IP address and registered in DNS: +Finally we run our application container: host1$ docker run --name a1 -ti ubuntu @@ -100,11 +97,10 @@ available. Also, we can tell weave to connect to multiple peers by supplying multiple addresses, separated by spaces. And we can [add peers dynamically](http://docs.weave.works/weave/latest_release/features.html#dynamic-topologies). -The router, DNS and proxy need to be started once per host. The -relevant container images are pulled down on demand, but if you wish -you can preload them by running `weave setup` - this is particularly -useful for automated deployments, and ensures that there are no delays -during later operations. +Weave must be started once per host. The relevant container images are +pulled down on demand, but if you wish you can preload them by running +`weave setup` - this is particularly useful for automated deployments, +and ensures that there are no delays during later operations. Now that we've got everything set up, let's see whether our containers can talk to each other... From d649bdddc72904cc64eaa812e11078bd7f730433 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Mon, 6 Jul 2015 12:59:07 +0100 Subject: [PATCH 3/3] Remove weave proxy-(env|config) for just (env|config). Readme changes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 418986b2..e31c8635 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ First start weave on $HOST1: Next we configure our environment so that containers launched via the docker command line are automatically attached to the weave network: - host1$ eval $(weave proxy-env) + host1$ eval $(weave env) Finally we run our application container: @@ -84,7 +84,7 @@ this host we simply launch them with `docker run` as appropriate. Next we repeat similar steps on `$HOST2`... host2$ weave launch $HOST1 - host2$ eval $(weave proxy-env) + host2$ eval $(weave env) host2$ docker run --name a2 -ti ubuntu The only difference, apart from the name of the application container,