From ef8b9c4f1ec0a29ff0426f45479e1776a8b64b73 Mon Sep 17 00:00:00 2001
From: Oluwatobi Bamidele <teebams49@gmail.com>
Date: Tue, 14 May 2024 18:21:46 +0100
Subject: [PATCH 1/2] fix: build image once and push to different tags

---
 .github/workflows/docker-build.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 342094c14..72bd17e2c 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -46,21 +46,22 @@ jobs:
         run: |
           echo $RELEASE_TAG
           echo ${{ env.RELEASE_TAG }}
-      - name: Run Docker buildx
+      - name: Build Docker image
         run: |
           docker buildx build \
-          --cache-from "type=local,src=/tmp/.buildx-cache" \
           --cache-to "type=local,dest=/tmp/.buildx-cache" \
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
-          --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}" \
-          --output "type=registry" ./
-      - name: Run Docker buildx
+          --load \
+          --tag "sphinx-tribes:temp" \
+          ./
+      - name: Tag and push Docker image with specific version tag
         run: |
-          docker buildx build \
-          --cache-from "type=local,src=/tmp/.buildx-cache" \
-          --cache-to "type=local,dest=/tmp/.buildx-cache" \
-          --platform linux/amd64,linux/arm64,linux/arm/v7 \
-          --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest" \
-          --output "type=registry" ./
+          docker tag "sphinx-tribes:temp" "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}"
+          docker push "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}"
+
+      - name: Tag and push Docker image with latest tag
+        run: |
+          docker tag "sphinx-tribes:temp" "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest"
+          docker push "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest"
 
 

From e4c8c4a215a4476aa25977d85ba59749b7382b1e Mon Sep 17 00:00:00 2001
From: Oluwatobi Bamidele <teebams49@gmail.com>
Date: Fri, 17 May 2024 14:29:12 +0100
Subject: [PATCH 2/2] update: added multi tag

---
 .github/workflows/docker-build.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 72bd17e2c..a61adc3c4 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -46,22 +46,13 @@ jobs:
         run: |
           echo $RELEASE_TAG
           echo ${{ env.RELEASE_TAG }}
-      - name: Build Docker image
+      - name: Run Docker buildx
         run: |
           docker buildx build \
+          --cache-from "type=local,src=/tmp/.buildx-cache" \
           --cache-to "type=local,dest=/tmp/.buildx-cache" \
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
-          --load \
-          --tag "sphinx-tribes:temp" \
-          ./
-      - name: Tag and push Docker image with specific version tag
-        run: |
-          docker tag "sphinx-tribes:temp" "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}"
-          docker push "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}"
-
-      - name: Tag and push Docker image with latest tag
-        run: |
-          docker tag "sphinx-tribes:temp" "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest"
-          docker push "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest"
-
+          --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}" \
+          --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest" \
+          --output "type=registry" ./