From 713bc1157d45f12a92a5c3ee9eedd83ff11d197d Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Thu, 11 Oct 2018 19:35:46 +0100
Subject: Deployment is working now

---
 docker/build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docker')

diff --git a/docker/build.sh b/docker/build.sh
index 289f54e2..ee46bf40 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Build and deploy on master branch
-#if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
+if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
     echo "Connecting to docker hub"
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
@@ -12,10 +12,10 @@
     docker push pythondiscord/hacktober-bot:latest
     
     echo "Deploying on server"
-    pepper ${SALTAPI_TARGET} state.apply docker/hacktoberbot --out=no_out --non-interactive
+    pepper ${SALTAPI_TARGET} state.apply docker/hacktoberbot --out=no_out --non-interactive &> /dev/null
 
-#    echo "Deploying container"
-#    curl -H "token: $AUTODEPLOY_TOKEN" $AUTODEPLOY_WEBHOOK
-#else
-#    echo "Skipping deploy"
-#fi
+    echo "Deploying container"
+    curl -H "token: $AUTODEPLOY_TOKEN" $AUTODEPLOY_WEBHOOK
+else
+    echo "Skipping deploy"
+fi
-- 
cgit v1.2.3