Fux prod deploy

NdagiStanley · Apr 29, 2020 · a3b4290 · a3b4290
1 parent 038f721
commit a3b4290
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.semaphore/prod-deploy.yml b/.semaphore/prod-deploy.yml
@@ -16,9 +16,9 @@ blocks:
         jobs:
         - name: Deploy on Heroku
           commands:
-            - docker pull stanmd/vue-django:$SEMAPHORE_GIT_BRANCH
+            - docker pull stanmd/vue-django:latest
             - heroku container:login
-            - docker tag stanmd/vue-django:$SEMAPHORE_GIT_BRANCH registry.heroku.com/$HEROKU_APP/web
+            - docker tag stanmd/vue-django:latest registry.heroku.com/$HEROKU_APP/web
             - docker push registry.heroku.com/$HEROKU_APP/web
             - heroku stack:set container --app $HEROKU_APP
             - heroku container:release web --app $HEROKU_APP
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -45,7 +45,7 @@ blocks:
           - docker run -it stanmd/vue-django:$BRANCH_NAME python3 manage.py test
           - echo "Push image"
           - echo "${DOCKER_PASSWORD}" | docker login -u stanmd --password-stdin
-          - if [[ "$BRANCH_NAME" =~ ^(v2-d2|v1-d1|v2-d1)$ ]]; then docker push stanmd/vue-django:$BRANCH_NAME; elif [ "$BRANCH_NAME" == develop ]; then docker push stanmd/vue-django; else echo "Not pushing to DockerHub"; fi
+          - if [[ "$BRANCH_NAME" =~ develop|v\d-d\d ]]; then docker push stanmd/vue-django:$BRANCH_NAME; elif [ "$BRANCH_NAME" == master ]; then docker push stanmd/vue-django:latest; else echo "Not pushing to DockerHub"; fi
 
 promotions:
   - name: Production Deployment