From 2ba5abc2bbb6799db62d768ed4a3f6fcfffed511 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Fri, 11 Sep 2015 11:02:51 +0100
Subject: [PATCH] rename 'VERSION' to 'WEAVE_VERSION'

to avoid potential accidental clashes with user's environment.

Closes #1389.
---
 weave | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 684f8795..7fb58e07 100755
--- a/weave
+++ b/weave
@@ -9,7 +9,7 @@ if [ "$SCRIPT_VERSION" = "(unreleased version)" ] ; then
 else
     IMAGE_VERSION=$SCRIPT_VERSION
 fi
-IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
+IMAGE_VERSION=${WEAVE_VERSION:-$IMAGE_VERSION}
 
 # - Docker versions prior to 1.2.0 cannot parse `--dns-search=.`
 # - Docker versions prior to 1.3.0 fail to include the domain when
@@ -100,7 +100,7 @@ exec_remote() {
         -v /proc:/hostproc \
         -e PROCFS=/hostproc \
         -e DOCKERHUB_USER="$DOCKERHUB_USER" \
-        -e VERSION \
+        -e WEAVE_VERSION \
         -e WEAVE_DEBUG \
         -e WEAVE_DOCKER_ARGS \
         -e WEAVEPROXY_DOCKER_ARGS \