Merge branch 'master' into weave_1.1_readme_updates

Conflicts:
	README.md

README.md

@@ -65,19 +65,27 @@ 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
-
-Next we configure our environment so that containers launched via the
-docker command line are automatically attached to the weave network:
-
     host1$ eval $(weave env)
-
-Finally we run our application container:
-
     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 weave. The second line configures our environment
+so that containers launched via the docker command line are
+automatically attached to the weave network. Finally, we run our
+application container.
+
 That's it! If our application consists of more than one container on
 this host we simply launch them with `docker run` as appropriate.
 

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=""