diff options
| -rw-r--r-- | azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | scripts/deploy-azure.sh | 37 |
2 files changed, 21 insertions, 21 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f063ea41..22f214226 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,11 +40,6 @@ jobs: - job: build displayName: 'Build containers' - trigger: - branches: - include: - - master - steps: - task: Docker@1 displayName: 'Login: Docker Hub' diff --git a/scripts/deploy-azure.sh b/scripts/deploy-azure.sh index f18407c8b..4df5cb0fc 100644 --- a/scripts/deploy-azure.sh +++ b/scripts/deploy-azure.sh @@ -1,24 +1,29 @@ #!/bin/bash -changed_lines=$(git diff HEAD~1 HEAD docker/base.Dockerfile | wc -l) +# Build and deploy on master branch +if [[ $BUILD_SOURCEBRANCHNAME == 'master' ]]; then + changed_lines=$(git diff HEAD~1 HEAD docker/base.Dockerfile | wc -l) -if [ $changed_lines != '0' ]; then - echo "base.Dockerfile was changed" + 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 "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 "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 "Building image" + docker build -t pythondiscord/bot:latest -f docker/bot.Dockerfile . -echo "Pushing image" -docker push pythondiscord/bot:latest + echo "Pushing image" + docker push pythondiscord/bot:latest -#echo "Deploying container" -#curl -H "token: $AUTODEPLOY_TOKEN" $AUTODEPLOY_WEBHOOK + # echo "Deploying container" + # curl -H "token: $AUTODEPLOY_TOKEN" $AUTODEPLOY_WEBHOOK +else + echo "Skipping deploy" +fi
\ No newline at end of file |