From 34bb7ae84afbcb4916a82ffaf080c3da95eefabb Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Mon, 27 Jul 2015 12:51:07 +0100
Subject: [PATCH 1/2] [circle] use new gce templates for docker 1.7.1

---
 test/gce.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/gce.sh b/test/gce.sh
index dd1cb63b..93629679 100755
--- a/test/gce.sh
+++ b/test/gce.sh
@@ -11,7 +11,7 @@ KEY_FILE=/tmp/gce_private_key.json
 SSH_KEY_FILE=$HOME/.ssh/gce_ssh_key
 PROJECT=${PROJECT:-positive-cocoa-90213}
 IMAGE=ubuntu-14-04
-TEMPLATE_NAME="test-template-2"
+TEMPLATE_NAME="test-template-3"
 ZONE=us-central1-a
 NUM_HOSTS=3
 SUFFIX=""

From 65e94f624bdc100b14e5df39a710ac39939266cd Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 27 Jul 2015 14:13:50 +0100
Subject: [PATCH 2/2] document how to run weave when docker access is root-only

Closes #1186.
---
 README.md | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 2eb8f808..4040127d 100644
--- a/README.md
+++ b/README.md
@@ -52,22 +52,30 @@ Say you have docker running on two hosts, accessible to each other as
 `$HOST1` and `$HOST2`, and want to deploy an application consisting of
 two containers, one on each host.
 
-First start weave on $HOST1:
+On $HOST1 we run:
 
     host1$ weave launch && weave launch-dns && weave launch-proxy
-
-this runs the weave router, DNS and Docker API 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:
-
     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:
-
     host1$ docker run --name a1 -ti ubuntu
 
+> NB: If the first command results in an error like
+> `http:///var/run/docker.sock/v1.19/containers/create: dial unix
+> /var/run/docker.sock: permission denied. Are you trying to connect
+> to a TLS-enabled daemon without TLS?` then you likely need to be
+> 'root' in order to connect to the Docker daemon. If so, run the
+> above and all subsequent commands in a *single* root shell (e.g. one
+> created with `sudo -s`). Do *not* prefix individual commands with
+> `sudo`, since some commands modify environment entries and hence
+> they all need to be executed from the same shell.
+
+The first line runs the weave router, DNS and Docker API proxy, each
+in their own container. The second line sets the `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. Finally, we run our application container; this happens
+via the proxy so it is automatically allocated an IP address and
+registered in DNS.
+
 That's it! If our application consists of more than one container on
 this host we simply launch them with `docker run` as appropriate.