This commit is contained in:
Mike Lang
2017-02-21 15:48:21 -08:00
parent 52f04c7a5a
commit 89ff2e84f8

View File

@@ -89,12 +89,7 @@ deployment:
branch: /^((?!master).)*$/ # not the master branch
commands:
- >
test -z "${DEPLOY_BRANCH}" || test -z "${DOCKER_USER}" || (
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS &&
docker tag weaveworks/scope:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:${CIRCLE_BRANCH//\//-} &&
docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:${CIRCLE_BRANCH//\//-} &&
make -d ui-upload
)
# release:
# branch: /release-[0-9]+\.[0-9]+/
# owner: weaveworks