mentos1386/send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into remove-bitly

Browse source
This commit is contained in:
Danny Coates 2017-06-22 15:46:38 -07:00 committed by GitHub
commit 45a45cfc8d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
circle.yml
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: