The DockerHub deployment should now run on 'master'

2 files changed, 2 insertions, 34 deletions

diff --git a/scripts/deploy-azure.sh b/scripts/deploy-azure.sh
index 9ffe01ab8..ed4b719e2 100644
--- a/scripts/deploy-azure.sh
+++ b/scripts/deploy-azure.sh
@@ -2,8 +2,8 @@
 
 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:latest .
 
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