ummm now does deploy work
This commit is contained in:
parent
16b54b89ca
commit
363b9cc8d0
2 changed files with 8 additions and 1 deletions
|
@ -35,7 +35,12 @@ deploy:
|
||||||
script: bash deploy.sh
|
script: bash deploy.sh
|
||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
on:
|
on:
|
||||||
branch: master OR production-docker
|
branch: production-docker
|
||||||
|
- provider: script
|
||||||
|
script: bash deploy.sh
|
||||||
|
skip_cleanup: true
|
||||||
|
on:
|
||||||
|
branch: master
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
|
|
|
@ -5,7 +5,9 @@ set -e
|
||||||
docker-compose build --no-cache
|
docker-compose build --no-cache
|
||||||
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
|
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
|
||||||
docker tag $APP_IMAGE_NAME $DOCKER_USERNAME/$DOCKER_REPOSITORY:$TRAVIS_COMMIT
|
docker tag $APP_IMAGE_NAME $DOCKER_USERNAME/$DOCKER_REPOSITORY:$TRAVIS_COMMIT
|
||||||
|
docker tag $APP_IMAGE_NAME $DOCKER_USERNAME/$DOCKER_REPOSITORY:latest
|
||||||
docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:$TRAVIS_COMMIT
|
docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:$TRAVIS_COMMIT
|
||||||
|
docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:latest
|
||||||
|
|
||||||
# echo $GCLOUD_SERVICE_KEY_PRD | base64 --decode -i > ${HOME}/gcloud-service-key.json
|
# echo $GCLOUD_SERVICE_KEY_PRD | base64 --decode -i > ${HOME}/gcloud-service-key.json
|
||||||
# gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json
|
# gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json
|
||||||
|
|
Loading…
Reference in a new issue