From e712ea658c0d2503eeee3bc24f563f730daeee3b Mon Sep 17 00:00:00 2001
From: soler_j <soler_j@etna-alternance.net>
Date: Sun, 27 Apr 2025 22:35:46 +0200
Subject: Réorganiser les étapes du workflow de construction Docker pour le
 merge et la poussée des images multi-architecture, en ajoutant la connexion
 au registre et en simplifiant la structure des étapes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 47 +++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 555622d..1091a2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,24 +62,33 @@ jobs:
           cache-to: type=gha,mode=max
 
   merge-and-push:
-    runs-on: ubuntu-latest
-    needs: build-api-image  # This ensures the merge happens only after build is complete
-    permissions:
-      contents: read
-      packages: write
+      runs-on: ubuntu-latest
+      needs: build-api-image  # This ensures the merge happens only after build is complete
+      permissions:
+        contents: read
+        packages: write
+
+      steps:
+        - name: Log in to the Container registry
+          uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+          with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+
+        - name: Pull amd64 image
+          run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:amd64
+
+        - name: Pull arm64 image
+          run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64
+
+        - name: Merge Docker images and push multi-arch image
+          run: |
+            docker buildx imagetools create \
+              --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
+              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:amd64 \
+              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64
+            docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
 
-    steps:
-      - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Merge Docker images and push multi-arch image
-        run: |
-          docker buildx imagetools create \
-            --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:amd64 \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-- 
cgit v1.2.3