From a786088e7bc5c35f6a771a2ebefabd0f45d17f9f Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Fri, 21 Mar 2025 20:23:43 +0100
Subject: [PATCH 1/2] Build image multi-platform amd64+arm64

---
 .github/workflows/build.yml | 15 +++++++--------
 update.sh                   | 10 +---------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc34975..78dfbb7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,21 +8,20 @@ on:
 
 jobs:
   build-docker-images:
-    strategy:
-      matrix:
-        dolibarr_version: [ 15.0.3, 16.0.5, 17.0.4, 18.0.6, 19.0.4, 20.0.4, 21.0.0, develop ]
-        os_version: [ ubuntu-24.04 ]
-    runs-on: ${{ matrix.os_version }}
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - env:
           DOCKER_BUILD: 1
           DOCKER_PUSH: 1
         run: |
-          echo secrets.DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}
-          echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          ./update.sh ${{ matrix.dolibarr_version }} ${{ matrix.os_version }}
+          ./update.sh
 
   update-readme:
     runs-on: ubuntu-24.04
diff --git a/update.sh b/update.sh
index e9b60fb..38df26f 100755
--- a/update.sh
+++ b/update.sh
@@ -19,13 +19,6 @@ source "${BASE_DIR}/versions.sh"
      DOLIBARR_VERSIONS=("$1")
  fi
 
-# Enforce build arch based on host arch
-if [[ "$2" == *"arm"* ]]; then
-  platform="linux/arm64"
-else
-  platform="linux/amd64"
-fi
-
 tags=""
 
 # First, clean the directory /images
@@ -92,13 +85,12 @@ for dolibarrVersion in "${DOLIBARR_VERSIONS[@]}"; do
         docker buildx build \
           --push \
           --compress \
-          --platform "$platform" \
+          --platform linux/amd64,linux/arm64 \
           ${buildOptionTags} \
           "${dir}"
       else
         docker build \
           --compress \
-          --platform "$platform" \
           ${buildOptionTags} \
           "${dir}"
       fi

From e375482a5f49fcd9234491eefe3c79fa52b90fcd Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Mon, 31 Mar 2025 20:19:12 +0200
Subject: [PATCH 2/2] Revert back strategy matrix for dolibarr version

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78dfbb7..102598c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,8 @@ on:
 
 jobs:
   build-docker-images:
+    strategy:
+      matrix: dolibarr_version: [ 15.0.3, 16.0.5, 17.0.4, 18.0.6, 19.0.4, 20.0.4, 21.0.0, develop ]
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
@@ -21,7 +23,7 @@ jobs:
           DOCKER_BUILD: 1
           DOCKER_PUSH: 1
         run: |
-          ./update.sh
+          ./update.sh ${{ matrix.dolibarr_version }}
 
   update-readme:
     runs-on: ubuntu-24.04