From eaac75f7cfd888dc5d49c4da3cbb1de663a097d6 Mon Sep 17 00:00:00 2001
From: tchapi <cyril.chapellier@alan.eu>
Date: Sun, 10 Mar 2024 00:13:17 +0100
Subject: [PATCH] Fix Workflow

---
 .github/workflows/main.yml   | 21 ++++++++++++---------
 docker/Dockerfile-standalone |  1 -
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43a00af..3589a0f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,14 +18,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        image:
+          - davis
+          - davis-standalone
         platform:
           - linux/amd64
           - linux/arm64
         include:
-          - dockerfile: docker/Dockerfile
-            image: davis
-          - dockerfile: docker/Dockerfile-standalone
-            image: davis-standalone
+          - image: davis
+            dockerfile: docker/Dockerfile
+          - image: davis-standalone
+            dockerfile: docker/Dockerfile-standalone
     steps:
       -
         name: Prepare
@@ -77,14 +80,14 @@ jobs:
       -
         name: Export digest
         run: |
-          mkdir -p /tmp/digests
+          mkdir -p /tmp/digests/
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"          
       -
         name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ env.PLATFORM_PAIR }}
+          name: digests-${{ matrix.image }}_${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -109,8 +112,8 @@ jobs:
         name: Download digests
         uses: actions/download-artifact@v4
         with:
-          path: /tmp/digests
-          pattern: digests-*
+          path: /tmp/digests/${{ matrix.image }}/
+          pattern: digests-${{ matrix.image }}_*
           merge-multiple: true
       -
         name: Set up Docker Buildx
@@ -139,7 +142,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Create manifest list and push
-        working-directory: /tmp/digests
+        working-directory: /tmp/digests/${{ matrix.image }}/
         run: |
           docker buildx imagetools create \
             $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
diff --git a/docker/Dockerfile-standalone b/docker/Dockerfile-standalone
index d6a7292..fb76a6b 100644
--- a/docker/Dockerfile-standalone
+++ b/docker/Dockerfile-standalone
@@ -85,7 +85,6 @@ RUN sed -i 's/listen = 9000/listen = \/var\/run\/php-fpm\/php-fpm.sock/' /usr/lo
 
 # Cleanup (only useful when using --squash)
 RUN docker-php-source delete && \
-    rm -rf /usr/local/bin/composer && \
     rm -rf /var/www/davis/docker
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]