Merge pull request #2447 from weaveworks/mike/scope-script/hotfix-image-name

scope script: Allow 'user' part of image name to be given by DOCKERHUB_USER env var
This commit is contained in:
Mike Lang
2017-04-16 20:00:23 -07:00
committed by GitHub

3
scope
View File

@@ -10,7 +10,8 @@ else
IMAGE_VERSION="$SCRIPT_VERSION"
fi
IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
SCOPE_IMAGE_NAME=weaveworks/scope
DOCKERHUB_USER=${DOCKERHUB_USER:-weaveworks}
SCOPE_IMAGE_NAME="$DOCKERHUB_USER/scope"
SCOPE_IMAGE="$SCOPE_IMAGE_NAME:$IMAGE_VERSION"
# Careful: it's easy to operate on (e.g. stop) the wrong scope instance
# when SCOPE{_APP,}_CONTAINER_NAME values differ between runs. Handle