From 162b1b55cd0810f486e9731773d0406f72376dff Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Thu, 27 Apr 2023 16:32:24 -0500
Subject: [PATCH 01/11] Updated CI workflow to add manual build for arm image

---
 ..._build.yml => docker_image_main_branch_arm.yml} |  0
 ...branch.yml => docker_image_main_branch_x86.yml} |  2 +-
 .../workflows/docker_image_manual_build_arm.yml    | 14 ++++++++++++++
 ...build.yml => docker_image_manual_build_x86.yml} |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 rename .github/workflows/{arm_docker_build.yml => docker_image_main_branch_arm.yml} (100%)
 rename .github/workflows/{docker_image_main_branch.yml => docker_image_main_branch_x86.yml} (88%)
 create mode 100644 .github/workflows/docker_image_manual_build_arm.yml
 rename .github/workflows/{docker_image_manual_build.yml => docker_image_manual_build_x86.yml} (85%)

diff --git a/.github/workflows/arm_docker_build.yml b/.github/workflows/docker_image_main_branch_arm.yml
similarity index 100%
rename from .github/workflows/arm_docker_build.yml
rename to .github/workflows/docker_image_main_branch_arm.yml
diff --git a/.github/workflows/docker_image_main_branch.yml b/.github/workflows/docker_image_main_branch_x86.yml
similarity index 88%
rename from .github/workflows/docker_image_main_branch.yml
rename to .github/workflows/docker_image_main_branch_x86.yml
index 4738713..eed8d56 100644
--- a/.github/workflows/docker_image_main_branch.yml
+++ b/.github/workflows/docker_image_main_branch_x86.yml
@@ -1,4 +1,4 @@
-name: Build and Push Docker image to Docker Hub
+name: Build and Push x86 Docker image to Docker Hub
 on:
   push:
     branches: [ main ]
diff --git a/.github/workflows/docker_image_manual_build_arm.yml b/.github/workflows/docker_image_manual_build_arm.yml
new file mode 100644
index 0000000..fde852b
--- /dev/null
+++ b/.github/workflows/docker_image_manual_build_arm.yml
@@ -0,0 +1,14 @@
+name: Manual Build and Push ARM Docker image to Docker Hub
+on:
+  workflow_dispatch:
+jobs:
+  build-and-push:
+    runs-on: macos-latest
+    steps:
+      - name: deploy
+        uses: actions/checkout@v2
+      - name: Build and push Docker image
+        uses: ./.github/action_templates/build-and-push
+        with:
+          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
+          github-sha: ${{ github.sha }}
\ No newline at end of file
diff --git a/.github/workflows/docker_image_manual_build.yml b/.github/workflows/docker_image_manual_build_x86.yml
similarity index 85%
rename from .github/workflows/docker_image_manual_build.yml
rename to .github/workflows/docker_image_manual_build_x86.yml
index ca7bacb..09bbd58 100644
--- a/.github/workflows/docker_image_manual_build.yml
+++ b/.github/workflows/docker_image_manual_build_x86.yml
@@ -1,4 +1,4 @@
-name: Manual Build and Push Docker image to Docker Hub
+name: Manual Build and Push x86 Docker image to Docker Hub
 on:
   workflow_dispatch:
 jobs:

From bdce97a1fe1faa6f3a89cb1ef0ed40ee64e4df67 Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Thu, 27 Apr 2023 17:23:26 -0500
Subject: [PATCH 02/11] Added set up QEMU and buildx

---
 .github/workflows/docker_image_manual_build_arm.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker_image_manual_build_arm.yml b/.github/workflows/docker_image_manual_build_arm.yml
index fde852b..e12cc26 100644
--- a/.github/workflows/docker_image_manual_build_arm.yml
+++ b/.github/workflows/docker_image_manual_build_arm.yml
@@ -3,10 +3,16 @@ on:
   workflow_dispatch:
 jobs:
   build-and-push:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: deploy
         uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: 'arm64,arm'
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and push Docker image
         uses: ./.github/action_templates/build-and-push
         with:

From 67d53198805d8a0b83b601aa4c76f23d0f6c5a73 Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Thu, 27 Apr 2023 17:26:30 -0500
Subject: [PATCH 03/11] Seperate arm and x86 manual build flow

---
 .github/workflows/docker_image_main_branch_arm.yml  | 2 +-
 .github/workflows/docker_image_manual_build_arm.yml | 3 ++-
 .github/workflows/docker_image_manual_build_x86.yml | 8 +-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker_image_main_branch_arm.yml b/.github/workflows/docker_image_main_branch_arm.yml
index 33023bb..375c767 100644
--- a/.github/workflows/docker_image_main_branch_arm.yml
+++ b/.github/workflows/docker_image_main_branch_arm.yml
@@ -6,7 +6,7 @@ on:
       - docker/**
 jobs:
   build-and-push:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: deploy
         uses: actions/checkout@v2
diff --git a/.github/workflows/docker_image_manual_build_arm.yml b/.github/workflows/docker_image_manual_build_arm.yml
index e12cc26..4f6e441 100644
--- a/.github/workflows/docker_image_manual_build_arm.yml
+++ b/.github/workflows/docker_image_manual_build_arm.yml
@@ -17,4 +17,5 @@ jobs:
         uses: ./.github/action_templates/build-and-push
         with:
           docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
\ No newline at end of file
+          github-sha: ${{ github.sha }}
+          image-platform: "arm"
\ No newline at end of file
diff --git a/.github/workflows/docker_image_manual_build_x86.yml b/.github/workflows/docker_image_manual_build_x86.yml
index f26a467..768e4fb 100644
--- a/.github/workflows/docker_image_manual_build_x86.yml
+++ b/.github/workflows/docker_image_manual_build_x86.yml
@@ -12,10 +12,4 @@ jobs:
         with:
           docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
           github-sha: ${{ github.sha }}
-          image-platform: "x86"
-      - name: Build and push Docker image for arm
-        uses: ./.github/action_templates/build-and-push
-        with:
-          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
-          image-platform: "arm"
\ No newline at end of file
+          image-platform: "x86"
\ No newline at end of file

From f1e2595e5fffe6c0a5b9cfc4caf0d0bb78671c5b Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Thu, 27 Apr 2023 22:18:31 -0500
Subject: [PATCH 04/11] Build image with latest and latest_arm tags

---
 .../build-and-push/action.yaml                | 30 +++++++++++++++----
 .../workflows/docker_image_manual_build.yml   | 23 ++++++++++++++
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/docker_image_manual_build.yml

diff --git a/.github/action_templates/build-and-push/action.yaml b/.github/action_templates/build-and-push/action.yaml
index a43f507..e9f181d 100644
--- a/.github/action_templates/build-and-push/action.yaml
+++ b/.github/action_templates/build-and-push/action.yaml
@@ -18,11 +18,31 @@ runs:
       shell: bash
       run: |
           echo "${{ inputs.docker-auth-token }}" | docker login --username awiciroh --password-stdin     
-    - name: Build and tag Docker image
+    # ------  ARM64 ------
+    - name: Build and tag Docker image (ARM64)
       shell: bash
-      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest docker/.      
-    - name: Push Docker image
+      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }} docker/.      
+      if: ${{ inputs.image-platform }} != ''
+    
+    - name: Push Docker image (ARM64)
       shell: bash
       run: |
-        docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:${{ inputs.github-sha }} 
-        docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest
+        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
+        docker push awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }}
+      if: ${{ inputs.image-platform }} != ''
+    # -------- END --------
+
+    # -------- AMD64 -------
+    - name: Build and tag Docker image (amd64)
+      shell: bash
+      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest docker/.      
+      if: ${{ inputs.image-platform }} == ''
+    
+    - name: Push Docker image (amd64)
+      shell: bash
+      run: |
+        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
+        docker push awiciroh/ciroh-ngen-image:latest
+      if: ${{ inputs.image-platform }} == ''
+
+    # -------- END ------ 
\ No newline at end of file
diff --git a/.github/workflows/docker_image_manual_build.yml b/.github/workflows/docker_image_manual_build.yml
new file mode 100644
index 0000000..d0b793e
--- /dev/null
+++ b/.github/workflows/docker_image_manual_build.yml
@@ -0,0 +1,23 @@
+name: Manual Build and Push x86 Docker image to Docker Hub
+on:
+  workflow_dispatch:
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: deploy
+        uses: actions/checkout@v2
+        
+      - name: Build and push Docker image for amd64
+        uses: ./.github/action_templates/build-and-push
+        with:
+          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
+          github-sha: ${{ github.sha }}
+          image-platform: ""
+      
+      - name: Build and push Docker image for arm64
+        uses: ./.github/action_templates/build-and-push
+        with:
+          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
+          github-sha: ${{ github.sha }}
+          image-platform: "arm"
\ No newline at end of file

From 9b16d8da4b278a8b23e004714016cc7487800fbc Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Thu, 27 Apr 2023 22:34:30 -0500
Subject: [PATCH 05/11] added buildx for multiarch and keeping image tag as
 latest

---
 .../build-and-push/action.yaml                | 35 ++++---------------
 .../workflows/docker_image_manual_build.yml   | 14 ++------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/.github/action_templates/build-and-push/action.yaml b/.github/action_templates/build-and-push/action.yaml
index e9f181d..7d43f30 100644
--- a/.github/action_templates/build-and-push/action.yaml
+++ b/.github/action_templates/build-and-push/action.yaml
@@ -10,7 +10,7 @@ inputs:
     required: true
   image-platform:
     description: 'Platform of the image to be built'
-    required: true
+    required: false
 runs:
   using: "composite"
   steps:
@@ -18,31 +18,10 @@ runs:
       shell: bash
       run: |
           echo "${{ inputs.docker-auth-token }}" | docker login --username awiciroh --password-stdin     
-    # ------  ARM64 ------
-    - name: Build and tag Docker image (ARM64)
-      shell: bash
-      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }} docker/.      
-      if: ${{ inputs.image-platform }} != ''
-    
-    - name: Push Docker image (ARM64)
-      shell: bash
-      run: |
-        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
-        docker push awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }}
-      if: ${{ inputs.image-platform }} != ''
-    # -------- END --------
-
-    # -------- AMD64 -------
-    - name: Build and tag Docker image (amd64)
-      shell: bash
-      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest docker/.      
-      if: ${{ inputs.image-platform }} == ''
-    
-    - name: Push Docker image (amd64)
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2 
+    # ------  Multiarch image ------
+    - name: Build and tag Docker image
       shell: bash
-      run: |
-        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
-        docker push awiciroh/ciroh-ngen-image:latest
-      if: ${{ inputs.image-platform }} == ''
-
-    # -------- END ------ 
\ No newline at end of file
+      run: docker buildx build --push --platform linux/arm64,linux/amd64 --tag awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest docker/.      
+      
\ No newline at end of file
diff --git a/.github/workflows/docker_image_manual_build.yml b/.github/workflows/docker_image_manual_build.yml
index d0b793e..36f97b0 100644
--- a/.github/workflows/docker_image_manual_build.yml
+++ b/.github/workflows/docker_image_manual_build.yml
@@ -1,4 +1,4 @@
-name: Manual Build and Push x86 Docker image to Docker Hub
+name: Manual Build and Push Docker image to Docker Hub
 on:
   workflow_dispatch:
 jobs:
@@ -8,16 +8,8 @@ jobs:
       - name: deploy
         uses: actions/checkout@v2
         
-      - name: Build and push Docker image for amd64
+      - name: Build and push Docker image for multi-architecture
         uses: ./.github/action_templates/build-and-push
         with:
           docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
-          image-platform: ""
-      
-      - name: Build and push Docker image for arm64
-        uses: ./.github/action_templates/build-and-push
-        with:
-          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
-          image-platform: "arm"
\ No newline at end of file
+          github-sha: ${{ github.sha }}
\ No newline at end of file

From 8a2f2d1bb4be9fa1006f3f155b4936430e1b03a6 Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Fri, 28 Apr 2023 08:14:55 -0500
Subject: [PATCH 06/11] Revert "Added set up QEMU and buildx"

This reverts commit bdce97a1fe1faa6f3a89cb1ef0ed40ee64e4df67.
---
 .github/workflows/docker_image_manual_build_arm.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/docker_image_manual_build_arm.yml b/.github/workflows/docker_image_manual_build_arm.yml
index 4f6e441..b226024 100644
--- a/.github/workflows/docker_image_manual_build_arm.yml
+++ b/.github/workflows/docker_image_manual_build_arm.yml
@@ -3,16 +3,10 @@ on:
   workflow_dispatch:
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: deploy
         uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: 'arm64,arm'
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
       - name: Build and push Docker image
         uses: ./.github/action_templates/build-and-push
         with:

From ecf1731bc5b9186087ff965a21529709c735beae Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Fri, 28 Apr 2023 08:15:07 -0500
Subject: [PATCH 07/11] Revert "Revert "Added set up QEMU and buildx""

This reverts commit 8a2f2d1bb4be9fa1006f3f155b4936430e1b03a6.
---
 .github/workflows/docker_image_manual_build_arm.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker_image_manual_build_arm.yml b/.github/workflows/docker_image_manual_build_arm.yml
index b226024..4f6e441 100644
--- a/.github/workflows/docker_image_manual_build_arm.yml
+++ b/.github/workflows/docker_image_manual_build_arm.yml
@@ -3,10 +3,16 @@ on:
   workflow_dispatch:
 jobs:
   build-and-push:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: deploy
         uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: 'arm64,arm'
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and push Docker image
         uses: ./.github/action_templates/build-and-push
         with:

From ab7922a95c6be4b9d436749d682d7289aa53f9d0 Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Fri, 28 Apr 2023 08:15:28 -0500
Subject: [PATCH 08/11] Revert "added buildx for multiarch and keeping image
 tag as latest"

This reverts commit 9b16d8da4b278a8b23e004714016cc7487800fbc.
---
 .../build-and-push/action.yaml                | 35 +++++++++++++++----
 .../workflows/docker_image_manual_build.yml   | 14 ++++++--
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/.github/action_templates/build-and-push/action.yaml b/.github/action_templates/build-and-push/action.yaml
index 7d43f30..e9f181d 100644
--- a/.github/action_templates/build-and-push/action.yaml
+++ b/.github/action_templates/build-and-push/action.yaml
@@ -10,7 +10,7 @@ inputs:
     required: true
   image-platform:
     description: 'Platform of the image to be built'
-    required: false
+    required: true
 runs:
   using: "composite"
   steps:
@@ -18,10 +18,31 @@ runs:
       shell: bash
       run: |
           echo "${{ inputs.docker-auth-token }}" | docker login --username awiciroh --password-stdin     
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2 
-    # ------  Multiarch image ------
-    - name: Build and tag Docker image
+    # ------  ARM64 ------
+    - name: Build and tag Docker image (ARM64)
+      shell: bash
+      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }} docker/.      
+      if: ${{ inputs.image-platform }} != ''
+    
+    - name: Push Docker image (ARM64)
+      shell: bash
+      run: |
+        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
+        docker push awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }}
+      if: ${{ inputs.image-platform }} != ''
+    # -------- END --------
+
+    # -------- AMD64 -------
+    - name: Build and tag Docker image (amd64)
+      shell: bash
+      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest docker/.      
+      if: ${{ inputs.image-platform }} == ''
+    
+    - name: Push Docker image (amd64)
       shell: bash
-      run: docker buildx build --push --platform linux/arm64,linux/amd64 --tag awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest docker/.      
-      
\ No newline at end of file
+      run: |
+        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
+        docker push awiciroh/ciroh-ngen-image:latest
+      if: ${{ inputs.image-platform }} == ''
+
+    # -------- END ------ 
\ No newline at end of file
diff --git a/.github/workflows/docker_image_manual_build.yml b/.github/workflows/docker_image_manual_build.yml
index 36f97b0..d0b793e 100644
--- a/.github/workflows/docker_image_manual_build.yml
+++ b/.github/workflows/docker_image_manual_build.yml
@@ -1,4 +1,4 @@
-name: Manual Build and Push Docker image to Docker Hub
+name: Manual Build and Push x86 Docker image to Docker Hub
 on:
   workflow_dispatch:
 jobs:
@@ -8,8 +8,16 @@ jobs:
       - name: deploy
         uses: actions/checkout@v2
         
-      - name: Build and push Docker image for multi-architecture
+      - name: Build and push Docker image for amd64
         uses: ./.github/action_templates/build-and-push
         with:
           docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
\ No newline at end of file
+          github-sha: ${{ github.sha }}
+          image-platform: ""
+      
+      - name: Build and push Docker image for arm64
+        uses: ./.github/action_templates/build-and-push
+        with:
+          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
+          github-sha: ${{ github.sha }}
+          image-platform: "arm"
\ No newline at end of file

From 1b7bf377aa5f248f8a8ac60393b8e13843448529 Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Fri, 28 Apr 2023 08:15:33 -0500
Subject: [PATCH 09/11] Revert "Build image with latest and latest_arm tags"

This reverts commit f1e2595e5fffe6c0a5b9cfc4caf0d0bb78671c5b.
---
 .../build-and-push/action.yaml                | 30 ++++---------------
 .../workflows/docker_image_manual_build.yml   | 23 --------------
 2 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/docker_image_manual_build.yml

diff --git a/.github/action_templates/build-and-push/action.yaml b/.github/action_templates/build-and-push/action.yaml
index e9f181d..a43f507 100644
--- a/.github/action_templates/build-and-push/action.yaml
+++ b/.github/action_templates/build-and-push/action.yaml
@@ -18,31 +18,11 @@ runs:
       shell: bash
       run: |
           echo "${{ inputs.docker-auth-token }}" | docker login --username awiciroh --password-stdin     
-    # ------  ARM64 ------
-    - name: Build and tag Docker image (ARM64)
+    - name: Build and tag Docker image
       shell: bash
-      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }} docker/.      
-      if: ${{ inputs.image-platform }} != ''
-    
-    - name: Push Docker image (ARM64)
+      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest docker/.      
+    - name: Push Docker image
       shell: bash
       run: |
-        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
-        docker push awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }}
-      if: ${{ inputs.image-platform }} != ''
-    # -------- END --------
-
-    # -------- AMD64 -------
-    - name: Build and tag Docker image (amd64)
-      shell: bash
-      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest docker/.      
-      if: ${{ inputs.image-platform }} == ''
-    
-    - name: Push Docker image (amd64)
-      shell: bash
-      run: |
-        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
-        docker push awiciroh/ciroh-ngen-image:latest
-      if: ${{ inputs.image-platform }} == ''
-
-    # -------- END ------ 
\ No newline at end of file
+        docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:${{ inputs.github-sha }} 
+        docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest
diff --git a/.github/workflows/docker_image_manual_build.yml b/.github/workflows/docker_image_manual_build.yml
deleted file mode 100644
index d0b793e..0000000
--- a/.github/workflows/docker_image_manual_build.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Manual Build and Push x86 Docker image to Docker Hub
-on:
-  workflow_dispatch:
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: deploy
-        uses: actions/checkout@v2
-        
-      - name: Build and push Docker image for amd64
-        uses: ./.github/action_templates/build-and-push
-        with:
-          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
-          image-platform: ""
-      
-      - name: Build and push Docker image for arm64
-        uses: ./.github/action_templates/build-and-push
-        with:
-          docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
-          github-sha: ${{ github.sha }}
-          image-platform: "arm"
\ No newline at end of file

From 1b5346af8ef7dbb19584cb38449016cd3a401d78 Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Fri, 28 Apr 2023 08:38:05 -0500
Subject: [PATCH 10/11] Updated repo and tag name

---
 .github/action_templates/build-and-push/action.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/action_templates/build-and-push/action.yaml b/.github/action_templates/build-and-push/action.yaml
index a43f507..4b57f69 100644
--- a/.github/action_templates/build-and-push/action.yaml
+++ b/.github/action_templates/build-and-push/action.yaml
@@ -20,9 +20,9 @@ runs:
           echo "${{ inputs.docker-auth-token }}" | docker login --username awiciroh --password-stdin     
     - name: Build and tag Docker image
       shell: bash
-      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest docker/.      
+      run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }} docker/.      
     - name: Push Docker image
       shell: bash
       run: |
-        docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:${{ inputs.github-sha }} 
-        docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest
+        docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} 
+        docker push awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }}

From c3c3f798a90b01daf5f36089f9cd078c4e0c3cbb Mon Sep 17 00:00:00 2001
From: Arpita Patel <gagarp@gmail.com>
Date: Fri, 28 Apr 2023 09:36:17 -0500
Subject: [PATCH 11/11] Updated CI workflow for main branch (arm image)

---
 .github/workflows/docker_image_main_branch_arm.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/docker_image_main_branch_arm.yml b/.github/workflows/docker_image_main_branch_arm.yml
index 375c767..4dd9569 100644
--- a/.github/workflows/docker_image_main_branch_arm.yml
+++ b/.github/workflows/docker_image_main_branch_arm.yml
@@ -10,6 +10,12 @@ jobs:
     steps:
       - name: deploy
         uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: 'arm64,arm'
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and push ARM Docker image for NGEN
         uses: ./.github/action_templates/build-and-push
         with: