Merge branch 'master' into remove-bitly

This commit is contained in:
Danny Coates
2017-06-22 15:46:38 -07:00
committed by GitHub

View File

@@ -9,13 +9,13 @@ deployment:
branch: master branch: master
commands: commands:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
- docker build . -t mozilla/fileshare:latest - docker build -t mozilla/fileshare:latest .
- docker push mozilla/fileshare:latest - docker push mozilla/fileshare:latest
tags: tags:
tags: /.*/ tags: /.*/
commands: commands:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
- docker build . -t mozilla/fileshare:$CIRCLE_TAG - docker build -t mozilla/fileshare:$CIRCLE_TAG .
- docker push mozilla/fileshare:$CIRCLE_TAG - docker push mozilla/fileshare:$CIRCLE_TAG
test: test: