weavetools -> weaveexec

This is to make a visible break with previous releases, such that a
newly downloaded weave script will definitely work.

Without this change in name, an existing weavetools image that doesn't
include the script might be invoked, resulting in a confusing message
for the user.

.gitignore

@@ -35,4 +35,4 @@ tools/build
 releases
 weave.tar
 weavedns.tar
-weavetools.tar
+weaveexec.tar

Makefile

@@ -1,4 +1,4 @@
-PUBLISH=publish_weave publish_weavedns publish_weavetools
+PUBLISH=publish_weave publish_weavedns publish_weaveexec
 
 .DEFAULT: all
 .PHONY: all update tests publish $(PUBLISH) clean prerequisites build
@@ -12,12 +12,12 @@ WEAVER_EXE=weaver/weaver
 WEAVEDNS_EXE=weavedns/weavedns
 WEAVER_IMAGE=$(DOCKERHUB_USER)/weave
 WEAVEDNS_IMAGE=$(DOCKERHUB_USER)/weavedns
-WEAVETOOLS_IMAGE=$(DOCKERHUB_USER)/weavetools
+WEAVEEXEC_IMAGE=$(DOCKERHUB_USER)/weaveexec
 WEAVER_EXPORT=weave.tar
 WEAVEDNS_EXPORT=weavedns.tar
-WEAVETOOLS_EXPORT=weavetools.tar
+WEAVEEXEC_EXPORT=weaveexec.tar
 
-all: $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVETOOLS_EXPORT)
+all: $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVEEXEC_EXPORT)
 
 update:
 	go get -u -f -v -tags -netgo ./$(dir $(WEAVER_EXE)) ./$(dir $(WEAVEDNS_EXE))
@@ -45,10 +45,10 @@ $(WEAVEDNS_EXPORT): weavedns/Dockerfile $(WEAVEDNS_EXE)
 	$(SUDO) docker build -t $(WEAVEDNS_IMAGE) weavedns
 	$(SUDO) docker save $(WEAVEDNS_IMAGE):latest > $@
 
-$(WEAVETOOLS_EXPORT): tools/Dockerfile weave
-	cp weave tools/weave
-	$(SUDO) docker build -t $(WEAVETOOLS_IMAGE) tools
-	$(SUDO) docker save $(WEAVETOOLS_IMAGE):latest > $@
+$(WEAVEEXEC_EXPORT): weaveexec/Dockerfile weave
+	cp weave weaveexec/weave
+	$(SUDO) docker build -t $(WEAVEEXEC_IMAGE) weaveexec
+	$(SUDO) docker save $(WEAVEEXEC_IMAGE):latest > $@
 
 # Add more directories in here as more tests are created
 tests:
@@ -63,8 +63,8 @@ $(PUBLISH): publish_%:
 publish: $(PUBLISH)
 
 clean:
-	-$(SUDO) docker rmi $(WEAVER_IMAGE) $(WEAVEDNS_IMAGE) $(WEAVETOOLS_IMAGE)
-	rm -f $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVETOOLS_EXPORT)
+	-$(SUDO) docker rmi $(WEAVER_IMAGE) $(WEAVEDNS_IMAGE) $(WEAVEEXEC_IMAGE)
+	rm -f $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVEEXEC_EXPORT)
 
 build:
 	$(SUDO) go clean -i net

site/building.md

@@ -50,8 +50,8 @@ $ make
 
 This will build the weave components and package them into three
 Docker images (`zettio/weave`, `zettio/weavedns`, and
-`zettio/weavetools`).  These are then exported (as
-`weave.tar`, `weavedns.tar` and `weavetools.tar`).
+`zettio/weaveexec`).  These are then exported (as `weave.tar`,
+`weavedns.tar` and `weaveexec.tar`).
 
 ## Building in a Docker container
 

test/setup.sh

@@ -13,7 +13,7 @@ echo Copying weave images and script to hosts
 for HOST in $HOSTS; do
     docker_on $HOST load -i ../weave.tar
     docker_on $HOST load -i ../weavedns.tar
-    docker_on $HOST load -i ../weavetools.tar
+    docker_on $HOST load -i ../weaveexec.tar
     run_on $HOST mkdir -p `dirname $WEAVE`
     cat ../weave         | run_on $HOST sh -c "cat > $WEAVE"
     cat ../bin/docker-ns | run_on $HOST sh -c "cat > $DOCKER_NS"

weave

@@ -45,10 +45,10 @@ PROCFS=${PROCFS:-/proc}
 
 BASE_IMAGE=$DOCKERHUB_USER/weave
 BASE_DNS_IMAGE=$DOCKERHUB_USER/weavedns
-BASE_TOOLS_IMAGE=$DOCKERHUB_USER/weavetools
+BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
 IMAGE=$BASE_IMAGE:$IMAGE_VERSION
 DNS_IMAGE=$BASE_DNS_IMAGE:$IMAGE_VERSION
-TOOLS_IMAGE=$BASE_TOOLS_IMAGE:$IMAGE_VERSION
+EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
 
 exec_remote() {
     docker run -t --rm \
@@ -59,7 +59,7 @@ exec_remote() {
         -e WEAVE_PASSWORD="$WEAVE_PASSWORD" \
         -e DOCKER_BRIDGE="$DOCKER_BRIDGE" \
         -e PROCFS=/hostproc --privileged --net=host \
-        $TOOLS_IMAGE --local "$@"
+        $EXEC_IMAGE --local "$@"
 }
 
 if [ "$1" = "--local" ]; then
@@ -496,7 +496,7 @@ DOCKER_VERSION_PATCH=$(echo "$DOCKER_VERSION" | cut -d. -f 3)
 
 case "$COMMAND" in
     setup)
-        for img in $IMAGE $DNS_IMAGE $TOOLS_IMAGE ; do
+        for img in $IMAGE $DNS_IMAGE $EXEC_IMAGE ; do
             docker pull $img
         done
         ;;
@@ -585,14 +585,14 @@ case "$COMMAND" in
         echo weave script $SCRIPT_VERSION
         ask_version $CONTAINER_NAME $IMAGE
         ask_version $DNS_CONTAINER_NAME $DNS_IMAGE
-        if ! TOOLS_IMAGE_ID=$(docker inspect --format='{{.Id}}' $TOOLS_IMAGE 2>/dev/null) ; then
-            echo "Unable to find $TOOLS_IMAGE image." >&2
+        if ! EXEC_IMAGE_ID=$(docker inspect --format='{{.Id}}' $EXEC_IMAGE 2>/dev/null) ; then
+            echo "Unable to find $EXEC_IMAGE image." >&2
         else
-            TOOLS_VERSION=$(docker images --no-trunc | grep $TOOLS_IMAGE_ID | grep -v latest | tr -s ' ' | cut -d ' ' -f 2 | tr "\n" ' ')
-            if [ -n "$TOOLS_VERSION" ] ; then
-                echo "weave tools $TOOLS_VERSION"
+            EXEC_VERSION=$(docker images --no-trunc | grep $EXEC_IMAGE_ID | grep -v latest | tr -s ' ' | cut -d ' ' -f 2 | tr "\n" ' ')
+            if [ -n "$EXEC_VERSION" ] ; then
+                echo "weave exec $EXEC_VERSION"
             else
-                echo "weave tools (unreleased version)"
+                echo "weave exec (unreleased version)"
             fi
         fi
         ;;