rename 'VERSION' to 'WEAVE_VERSION'

to avoid potential accidental clashes with user's environment.

Closes #1389.
This commit is contained in:
Matthias Radestock committed 2015-09-11 11:02:51 +01:00
1 parent 3d4a8aaad1
commit 2ba5abc2bb
1 file changed
+2 -2
+2 -2
View File
@@ -9,7 +9,7 @@ if [ "$SCRIPT_VERSION" = "(unreleased version)" ] ; then
else else
IMAGE_VERSION=$SCRIPT_VERSION IMAGE_VERSION=$SCRIPT_VERSION
fi 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.2.0 cannot parse `--dns-search=.`
# - Docker versions prior to 1.3.0 fail to include the domain when # - Docker versions prior to 1.3.0 fail to include the domain when
@@ -100,7 +100,7 @@ exec_remote() {
-v /proc:/hostproc \ -v /proc:/hostproc \
-e PROCFS=/hostproc \ -e PROCFS=/hostproc \
-e DOCKERHUB_USER="$DOCKERHUB_USER" \ -e DOCKERHUB_USER="$DOCKERHUB_USER" \
-e VERSION \ -e WEAVE_VERSION \
-e WEAVE_DEBUG \ -e WEAVE_DEBUG \
-e WEAVE_DOCKER_ARGS \ -e WEAVE_DOCKER_ARGS \
-e WEAVEPROXY_DOCKER_ARGS \ -e WEAVEPROXY_DOCKER_ARGS \