Add dependency on docker/publish to deploy

mysilio-co · Oct 2, 2022 · 6977d2a · 6977d2a
1 parent 1f88b20
commit 6977d2a
Showing 1 changed file with 13 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,7 +45,7 @@ jobs:
       - run: helmfile --file .deploy/helmfile.yaml diff
 
 workflows:
-  production-deploy:
+  deploy:
     jobs:
       - docker/publish:
           context:
@@ -58,43 +58,35 @@ workflows:
           docker-password: DOCKER_PASSWORD
           filters:
             branches:
-              only: main
+              only:
+                - main
+                - staging
       - helmfile-apply:
-          name: apply/production
-          env: production
+          name: apply/staging
+          env: staging
           context:
             - kube-primary
             - docker-org-itme
             - docker-user-ian
             - mysilio-me-smtp
-          filters:
-            branches:
-              only: main
-  staging-deploy:
-    jobs:
-      - docker/publish:
-          context:
-            - docker-org-itme
-            - docker-user-ian
-          image: itme/$CIRCLE_PROJECT_REPONAME
-          tag: $CIRCLE_SHA1
-          # can't use $ here, need to give it an env var name
-          docker-username: DOCKER_USER
-          docker-password: DOCKER_PASSWORD
           filters:
             branches:
               only: staging
+          requires:
+            - docker/publish
       - helmfile-apply:
-          name: apply/staging
-          env: staging
+          name: apply/production
+          env: production
           context:
             - kube-primary
             - docker-org-itme
             - docker-user-ian
             - mysilio-me-smtp
           filters:
             branches:
-              only: staging
+              only: main
+          requires:
+            - docker/publish
   diff:
     jobs:
       - helmfile-diff: