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.
This commit is contained in:
Matthias Radestock committed 2014-12-30 16:20:00 +00:00
1 parent a2fcda9267
commit 57856a5584
1 file changed
+10 -2
+10 -2
View File
@@ -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