From 95ce00e551ffd4c6d01ee8589a49b9390d911799 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Tue, 15 Sep 2015 09:58:46 +0100 Subject: [PATCH 1/2] moving boot2docker instructions into the readme --- README.md | 5 +++++ site/boot2docker.md | 34 ---------------------------------- 2 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 site/boot2docker.md diff --git a/README.md b/README.md index 452e61a9..ad82c1a8 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,11 @@ Ensure you are running Linux (kernel 3.8 or later) and have Docker sudo curl -L git.io/weave -o /usr/local/bin/weave sudo chmod a+x /usr/local/bin/weave +For usage on OSX (with Docker Machine) you first need to make sure +that a VM is running and configured, as shown in [the Docker Machine +documentation](https://docs.docker.com/installation/mac/#from-your-shell). +Then you can launch weave directly from the OSX host. + CoreOS users see [here](https://github.com/fintanr/weave-gs/blob/master/coreos-simple/user-data) for an example of installing weave using cloud-config. Amazon ECS users see diff --git a/site/boot2docker.md b/site/boot2docker.md deleted file mode 100644 index f964082d..00000000 --- a/site/boot2docker.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: Installing Weave with Boot2Docker -layout: default ---- - -# Installing Weave with Boot2Docker - -If you are running Docker inside the Boot2Docker VM, e.g. because you -are on a Mac, then the following changes are required to the weave -instructions. First, we need to get Boot2Docker running: - - host1$ boot2docker init - host1$ boot2docker start - host1$ eval "$(boot2docker shellinit)" - -Assuming you have fetched the 'weave' script via curl or similar, and -it is in the current directory, launch weave on the Boot2Docker VM and -configure our shell. Boot2Docker uses TLS, but weave will auto-detect -that, and configure things appropriately. - - host1$ weave launch - host1$ eval "$(weave env)" - -Now, we can use the docker command to run our containers, as shown in -the [proxy documentation](proxy.html): - - host1$ docker run -it ubuntu - -For more information about how to access services running in -Boot2Docker from the host or other machines (i.e. outside of the weave -network), see these pages: - -* https://github.com/docker/docker/issues/4007 -* http://viget.com/extend/how-to-use-docker-on-os-x-the-missing-guide From caccba18e9776d48db51c7947172cf8091820140 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Thu, 15 Oct 2015 15:20:50 +0100 Subject: [PATCH 2/2] Mention fast datapath port --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad82c1a8..0f024ee3 100644 --- a/README.md +++ b/README.md @@ -107,9 +107,8 @@ The only difference, apart from the name of the application container, is that we tell our weave that it should peer with the weave on `$HOST1` (specified as the IP address or hostname, and optional `:port`, by which `$HOST2` can reach it). NB: if there is a firewall -between `$HOST1` and `$HOST2`, you must open the weave port (6783 by -default; this can be overriden by setting `WEAVE_PORT`) for TCP and -UDP. +between `$HOST1` and `$HOST2`, you must permit traffic to the weave +control port (TCP 6783) and data ports (UDP 6783/6784). Note that we could instead have told the weave on `$HOST1` to connect to `$HOST2`, or told both about each other. Order does not matter here;