From 9abb4366c23f2acb1178d848f7ad1aa3cba67065 Mon Sep 17 00:00:00 2001
From: anthony <quereantho@gmail.com>
Date: Mon, 3 Jan 2022 08:42:34 +0100
Subject: [PATCH 1/3] :construction_worker: Pass docker tags as job parameters

---
 .circleci/config.yml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b76cc54..95af61c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ globals:
   docker_hub:
     user-id: &dockerhub-user-id anthonyjhoiro
     password: &dockerhub-password $DOCKERHUB_PASSWORD
-    image: &dockerhub-image devops-tpfinal
+    image: &dockerhub-image devops-tpfinal-back
 
 
 # --- Commands --- #
@@ -82,6 +82,10 @@ jobs:
 
   docker-build:
     <<: *shared-config
+    parameters:
+      tags:
+        default: ""
+        type: string
     environment:
       DOCKER_HUB_PWD: *dockerhub-password
       DOCKER_HUB_USER_ID: *dockerhub-user-id
@@ -97,10 +101,16 @@ jobs:
           name: Publish image to Docker Hub
           command: |
             echo $DOCKERHUB_PASSWORD | docker login -u $DOCKER_HUB_USER_ID --password-stdin
-            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
-            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
-            docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
-            docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
+
+            for tag in <<parameters.tags>>
+            do
+              docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag
+              docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag
+            done
+#            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
+#
+#                              docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
+
 
   deploy-heroku:
     <<: *shared-config
@@ -110,7 +120,6 @@ jobs:
           username: *dockerhub-user-id
           password: *dockerhub-password
     steps:
-      - checkout
       - setup_dependencies
       - run:
           name: Heroku Deploy
@@ -142,6 +151,7 @@ workflows:
           requires:
             - build
       - docker-build:
+          tags: "latest $CIRCLE_BUILD_NUM"
           requires:
             - test
             - test-e2e

From 996f59545e287afe26c04688874d3dad93097306 Mon Sep 17 00:00:00 2001
From: anthony <quereantho@gmail.com>
Date: Mon, 3 Jan 2022 08:44:08 +0100
Subject: [PATCH 2/3] :green_heart: Remove docker build branch restrictions

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95af61c..3c7452d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -156,10 +156,10 @@ workflows:
             - test
             - test-e2e
             - lint
-          filters:
-            branches:
-              only:
-                - main
+#          filters:
+#            branches:
+#              only:
+#                - main
       - deploy-heroku:
           requires:
             - test

From 67d013ed132ed46ffe4b2471deea43a5a3ce4ad2 Mon Sep 17 00:00:00 2001
From: anthony <quereantho@gmail.com>
Date: Mon, 3 Jan 2022 08:51:08 +0100
Subject: [PATCH 3/3] :construction_worker: Add docker build for dev
 environment

---
 .circleci/config.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3c7452d..d9448d4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,9 +107,9 @@ jobs:
               docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag
               docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag
             done
-#            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
-#
-#                              docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
+  #            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
+  #
+  #                              docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
 
 
   deploy-heroku:
@@ -156,10 +156,22 @@ workflows:
             - test
             - test-e2e
             - lint
-#          filters:
-#            branches:
-#              only:
-#                - main
+          filters:
+            branches:
+              only:
+                - main
+
+      - docker-build:
+          tags: "dev $CIRCLE_BUILD_NUM-dev"
+          requires:
+            - test
+            - test-e2e
+            - lint
+          filters:
+            branches:
+              only:
+                - develop
+
       - deploy-heroku:
           requires:
             - test