This commit is contained in:
Mike Lang
2017-02-21 18:22:59 -08:00
parent 7a7b55138b
commit 9eafed6b1f

View File

@@ -77,7 +77,7 @@ deployment:
)) &&
docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope &&
docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./tools/image-tag) &&
(test -z "${UI_BUCKET_KEY_ID}" || make ui-upload)
(test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload))
)
- |
test -z "${QUAY_USER}" || (
@@ -89,7 +89,7 @@ deployment:
branch: /^((?!master).)*$/ # not the master branch
commands:
- >
make -d ui-upload >$SRCDIR/make.log 2>&1 && AWS_ACCESS_KEY_ID=$UI_BUCKET_KEY_ID AWS_SECRET_ACCESS_KEY=$UI_BUCKET_KEY_SECRET aws s3 cp $SRCDIR/make.log s3://static.weave.works/scope-ui/temp-make.log
cd $SRCDIR && make ui-upload
# release:
# branch: /release-[0-9]+\.[0-9]+/
# owner: weaveworks