From f185c3ebb211cd5d56970c0fb98242a11ccc42d3 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Aug 2014 19:45:11 +0100 Subject: [PATCH 1/4] explain different roles of weave and docker port mapping --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index d1b0cd5c..7a55f50a 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ hosts to be connected across an untrusted network. With weave you can easily construct applications consisting of multiple containers, running anywhere. +Weave complements Docker's existing networking capabilities - use +weave to establish network connectivity *between* containers, and +Docker port mappings etc to establish network connectivity *to* +individual containers from the outside world. + ## Installation To run weave on a host, you need to install... From 5d59f69228523bb0e917d49b180e9b485f9e5e80 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Aug 2014 21:30:02 +0100 Subject: [PATCH 2/4] explain that weave security isn't as daft as it may first appear --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a55f50a..095a8e00 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,9 @@ launching weave, e.g. host1# WEAVE=$(weave launch 10.0.0.1/16 -password wEaVe) -The same password must be specified for all weave peers. +The same password must be specified for all weave peers; it is the +basis for creating ephemeral session keys for connections between +peers. ### Multi-cloud networking From e93dbde9e05b72012322ba348b1f4d8fefb465fb Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Aug 2014 21:47:36 +0100 Subject: [PATCH 3/4] note that building weave requires go --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 095a8e00..05a32c41 100644 --- a/README.md +++ b/README.md @@ -248,7 +248,8 @@ and then inspect the logs. (NB. This is only necessary if you want to work on weave. Also, these instructions have only been tested on Ubuntu.) -To build weave you need `libpcap-dev` and `docker` installed. +To build weave you need `libpcap-dev` and `docker` installed. And +`go`. Then simply run From c299cda859fcde3b54eaedddd571642a478cc40a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Aug 2014 22:09:13 +0100 Subject: [PATCH 4/4] remove more shades of security daftness --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 05a32c41..cdb3709f 100644 --- a/README.md +++ b/README.md @@ -167,9 +167,9 @@ launching weave, e.g. host1# WEAVE=$(weave launch 10.0.0.1/16 -password wEaVe) -The same password must be specified for all weave peers; it is the -basis for creating ephemeral session keys for connections between -peers. +The same password must be specified for all weave peers; it is the a +component in the creation of ephemeral session keys for connections +between peers. ### Multi-cloud networking