diff options
| author |  Derek Fitzpatrick <[email protected]> | 2018-10-12 15:43:34 -0700 |
|---|---|---|
| committer | Derek Fitzpatrick <[email protected]> | 2018-10-12 15:43:34 -0700 |
| commit | d6051c5e8ef1a20b0833e67f75c5367df12e5622 (patch) | |
| tree | 92ec894452eb4068a0553d531ac1515fb2d41ca8 /docker/build.sh | |
| parent | Fixed linting: Multiple imports on single line. (diff) | |
| parent | The app was logging to the wrong directory. This is now fixed. Also silenced ... (diff) | |
Merge branch 'master' of https://github.com/discord-python/hacktoberbot into vote-monster-refactor
Diffstat (limited to 'docker/build.sh')
| -rwxr-xr-x | docker/build.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/docker/build.sh b/docker/build.sh index 289f54e2..153fbccc 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,7 @@ docker push pythondiscord/hacktober-bot:latest echo "Deploying on server" - pepper ${SALTAPI_TARGET} state.apply docker/hacktoberbot --out=no_out --non-interactive - -# echo "Deploying container" -# curl -H "token: $AUTODEPLOY_TOKEN" $AUTODEPLOY_WEBHOOK -#else -# echo "Skipping deploy" -#fi + pepper ${SALTAPI_TARGET} state.apply docker/hacktoberbot --out=no_out --non-interactive &> /dev/null +else + echo "Skipping deploy" +fi |