From f14808dfcb761d2a0b471f94f6dba9aaf27cd577 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Thu, 7 Sep 2023 10:10:35 +0200
Subject: [PATCH] :green_heart: Fix docker deployment tagging

---
 .github/workflows/publish_docker_images.yml | 55 +++++++++------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml
index 699c0906e..db605f307 100644
--- a/.github/workflows/publish_docker_images.yml
+++ b/.github/workflows/publish_docker_images.yml
@@ -24,11 +24,6 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: baptistearno/typebot-${{ matrix.app }}
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -44,26 +39,25 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          tags: ${{ steps.image-meta.outputs.tags }}
           labels: ${{ steps.image-meta.outputs.labels }}
-          outputs: type=image,name=baptistearno/typebot-${{ matrix.app }},push-by-digest=true,name-canonical=true,push=true
           platforms: linux/amd64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ matrix.app }}-amd
+          cache-to: type=gha,scope=${{ matrix.app }}-amd,mode=max
           build-args: |
             SCOPE=${{ matrix.app }}
+          outputs: type=image,name=baptistearno/typebot-${{ matrix.app }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
-          mkdir -p /tmp/digests
+          mkdir -p /tmp/digests/${{ matrix.app }}
           digest="${{ steps.docker_build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
+          touch "/tmp/digests/${{ matrix.app }}/${digest#sha256:}"
 
       - name: Upload digest
         uses: actions/upload-artifact@v3
         with:
-          name: digests
-          path: /tmp/digests/*
+          name: digests-${{ matrix.app }}
+          path: /tmp/digests/${{matrix.app}}/*
           if-no-files-found: error
           retention-days: 1
 
@@ -83,11 +77,6 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: baptistearno/typebot-${{ matrix.app }}
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -103,30 +92,29 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          tags: ${{ steps.image-meta.outputs.tags }}
           labels: ${{ steps.image-meta.outputs.labels }}
-          outputs: type=image,name=baptistearno/typebot-${{ matrix.app }},push-by-digest=true,name-canonical=true,push=true
           platforms: linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ matrix.app }}-arm
+          cache-to: type=gha,scope=${{ matrix.app }}-arm,mode=max
           build-args: |
             SCOPE=${{ matrix.app }}
+          outputs: type=image,name=baptistearno/typebot-${{ matrix.app }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
-          mkdir -p /tmp/digests
+          mkdir -p /tmp/digests/${{ matrix.app }}
           digest="${{ steps.docker_build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
+          touch "/tmp/digests/${{ matrix.app }}/${digest#sha256:}"
 
       - name: Upload digest
         uses: actions/upload-artifact@v3
         with:
-          name: digests
-          path: /tmp/digests/*
+          name: digests-${{ matrix.app }}
+          path: /tmp/digests/${{matrix.app}}/*
           if-no-files-found: error
           retention-days: 1
 
-  merge:
+  merge-and-push:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
     needs:
@@ -136,11 +124,11 @@ jobs:
       matrix:
         app: ['builder', 'viewer']
     steps:
-      - name: Download digests
+      - name: Download AMD digests
         uses: actions/download-artifact@v3
         with:
-          name: digests
-          path: /tmp/digests
+          name: digests-${{ matrix.app }}
+          path: /tmp/digests/${{ matrix.app }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Docker meta
@@ -148,13 +136,18 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: baptistearno/typebot-${{ matrix.app }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Create manifest list and push
-        working-directory: /tmp/digests
+        working-directory: /tmp/digests/${{ matrix.app }}
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf 'baptistearno/typebot-${{ matrix.app }}@sha256:%s ' *)