Add release v2.1.1

Typo
Merge pull request #3176 from weaveworks/issues/3175-fix-install
2017-11-17 14:17:31 +00:00 · 2017-11-17 14:15:10 +00:00 · 2017-11-17 14:14:41 +00:00 · 2017-11-17 13:51:10 +00:00 · 2017-11-17 13:31:46 +00:00
2 changed files with 17 additions and 4 deletions
@@ -1,3 +1,7 @@
+## Release 2.1.1
+
+As 2.1.0, but fixing a couple of installation glitches. #3175,#3176
+
 ## Release 2.1.0

 ##New Features
@@ -35,7 +39,7 @@ addresses when many nodes are added and deleted over a long period.
 * Images are now also built for the ppc64le platform #3129
 * Tweak build scripts to run on OSX as well as Linux #3135

-##External Contributers
+##External Contributors

 Thanks to the following contributors:
@caarlos0
@@ -15,7 +15,9 @@ MIN_DOCKER_VERSION=1.10.0
 DOCKERHUB_USER=${DOCKERHUB_USER:-weaveworks}
 BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
 EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
-WEAVEDB_IMAGE=$DOCKERHUB_USER/weavedb
+WEAVEDB_IMAGE=$DOCKERHUB_USER/weavedb:latest
+BASE_IMAGE=$DOCKERHUB_USER/weave
+IMAGE=$BASE_IMAGE:$IMAGE_VERSION
 PROXY_HOST=${PROXY_HOST:-$(echo "${DOCKER_HOST#tcp://}" | cut -s -d: -f1)}
 PROXY_HOST=${PROXY_HOST:-127.0.0.1}
 DOCKER_CLIENT_HOST=${DOCKER_CLIENT_HOST:-$DOCKER_HOST}
@@ -217,6 +219,15 @@ case "$1" in
            fi
        fi
        ;;
+    launch)
+        # this is necessary because 'util_op run-container' doesn't do
+        # an implied pull like 'docker run' does
+        if [ -z "$IS_LOCAL" ] ; then
+            for img in $IMAGE $WEAVEDB_IMAGE ; do
+                docker inspect -f "_" $img >/dev/null 2>&1 || docker pull $img
+            done
+        fi
+        ;;
    setup)
        # call 'docker pull' outside weaveexec so we don't need a
        # docker binary inside
@@ -243,8 +254,6 @@ fi

 # Default restart policy for router/proxy
 RESTART_POLICY="--restart always"
-BASE_IMAGE=$DOCKERHUB_USER/weave
-IMAGE=$BASE_IMAGE:$IMAGE_VERSION
 CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}

 PLUGIN_NAME="$DOCKERHUB_USER/net-plugin"
Author	SHA1	Message	Date
Bryan Boreham	ebbf3d4244	Add release v2.1.1	2017-11-17 14:17:31 +00:00
Bryan Boreham	ceb36d1891	Typo	2017-11-17 14:15:10 +00:00
Bryan Boreham	4caa850853	Merge pull request #3176 from weaveworks/issues/3175-fix-install Fix 2.1.0 install issues	2017-11-17 14:14:41 +00:00
Bryan Boreham	96cecf1796	Pull images before running inside weaveexec container Now we don't bundle the docker command inside weaveexec, we need to do an explicit 'docker pull' to ensure the images are there. Also set the weavedb tag to :latest to remove a warning from docker	2017-11-17 13:51:10 +00:00
Bryan Boreham	51c7af8fb4	Set IMAGE before using it	2017-11-17 13:31:46 +00:00