From 57856a5584f10aba33e43733924f329c9772f3fc Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 30 Dec 2014 16:20:00 +0000
Subject: [PATCH] align script and image versions - released weave scripts run
 their corresponding image versions - unreleased weave scripts run the
 'latest'-tagged image versions

The image version to run can also be specified explicitly by setting
VERSION. Useful for testing, mainly.
---
 weave | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 88fc10bd..63896dec 100755
--- a/weave
+++ b/weave
@@ -33,8 +33,16 @@ usage() {
 
 [ $# -gt 0 ] || usage
 
-IMAGE=zettio/weave
-DNS_IMAGE=zettio/weavedns
+if [ "$SCRIPT_VERSION" = "(unreleased version)" ] ; then
+    IMAGE_VERSION=latest
+else
+    IMAGE_VERSION=$SCRIPT_VERSION
+fi
+
+IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
+
+IMAGE=zettio/weave:$IMAGE_VERSION
+DNS_IMAGE=zettio/weavedns:$IMAGE_VERSION
 CONTAINER_NAME=weave
 DNS_CONTAINER_NAME=weavedns
 BRIDGE=weave