diff options
| author |  sco1 <[email protected]> | 2019-09-22 15:15:27 -0400 |
|---|---|---|
| committer | sco1 <[email protected]> | 2019-09-22 15:15:27 -0400 |
| commit | 9e30880df12d085b545ed3d429b2dcea3ea7d544 (patch) | |
| tree | b3409f6be37e20ad8c4f67bcb0fe609647d6f93f /scripts | |
| parent | Make defcon days command turn on defcon, refactor log messaging (diff) | |
| parent | Fix date formatting bug in infraction search (diff) | |
Merge branch 'master' into defcon-fix-django
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/deploy-azure.sh | 8 | ||||
| -rw-r--r-- | scripts/deploy.sh | 32 |
2 files changed, 4 insertions, 36 deletions
diff --git a/scripts/deploy-azure.sh b/scripts/deploy-azure.sh index af69ab46b..ed4b719e2 100644 --- a/scripts/deploy-azure.sh +++ b/scripts/deploy-azure.sh @@ -2,11 +2,11 @@ cd .. -# Build and deploy on django branch, only if not a pull request -if [[ ($BUILD_SOURCEBRANCHNAME == 'django') && ($SYSTEM_PULLREQUEST_PULLREQUESTID == '') ]]; then +# Build and deploy on master branch, only if not a pull request +if [[ ($BUILD_SOURCEBRANCHNAME == 'master') && ($SYSTEM_PULLREQUEST_PULLREQUESTID == '') ]]; then echo "Building image" - docker build -t pythondiscord/bot:django . + docker build -t pythondiscord/bot:latest . echo "Pushing image" - docker push pythondiscord/bot:django + docker push pythondiscord/bot:latest fi diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100644 index 070d0ec26..000000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Build and deploy on master branch -if [[ $CI_COMMIT_REF_SLUG == 'master' ]]; then - echo "Connecting to docker hub" - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - changed_lines=$(git diff HEAD~1 HEAD docker/base.Dockerfile | wc -l) - - if [ $changed_lines != '0' ]; then - echo "base.Dockerfile was changed" - - echo "Building bot base" - docker build -t pythondiscord/bot-base:latest -f docker/base.Dockerfile . - - echo "Pushing image to Docker Hub" - docker push pythondiscord/bot-base:latest - else - echo "base.Dockerfile was not changed, not building" - fi - - echo "Building image" - docker build -t pythondiscord/bot:latest -f docker/bot.Dockerfile . - - echo "Pushing image" - docker push pythondiscord/bot:latest - - echo "Deploying container" - curl -H "token: $AUTODEPLOY_TOKEN" $AUTODEPLOY_WEBHOOK -else - echo "Skipping deploy" -fi |