From ec18a77e7e1954c5eeec32628cdd62ad2d661618 Mon Sep 17 00:00:00 2001
From: garanews <puntogtg@tiscali.it>
Date: Wed, 31 Jul 2024 11:20:49 +0200
Subject: [PATCH] Update multiarch.yml

---
 .github/workflows/multiarch.yml | 121 +++++++-------------------------
 1 file changed, 24 insertions(+), 97 deletions(-)

diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
index b6329642..314a51aa 100644
--- a/.github/workflows/multiarch.yml
+++ b/.github/workflows/multiarch.yml
@@ -9,104 +9,30 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build_django:
+  build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         platform: [linux/amd64, linux/arm64]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+        include:
+          - platform: linux/amd64
+            file: ./compose/local/django/Dockerfile
+            image: ghcr.io/ldo-cert/orochi_django
+            name: ldo-cert/orochi_django
+          - platform: linux/arm64
+            file: ./compose/local/dask/Dockerfile
+            image: ghcr.io/ldo-cert/orochi_worker
+            name: ldo-cert/orochi_worker
+          - platform: linux/amd64
+            file: ./compose/local/nginx/Dockerfile
+            image: ghcr.io/ldo-cert/orochi_nginx
+            name: ldo-cert/orochi_nginx
+          - platform: linux/arm64
+            file: ./compose/local/nginx/Dockerfile
+            image: ghcr.io/ldo-cert/orochi_nginx
+            name: ldo-cert/orochi_nginx
 
-      - name: Extract metadata for Django
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/ldo-cert/orochi_django
-
-      - name: Build and push Django image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./compose/local/django/Dockerfile
-          platforms: ${{ matrix.platform }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            TARGETPLATFORM=${{ matrix.platform }}
-            BUILDPLATFORM=${{ runner.os }}
-
-  build_worker:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [linux/amd64, linux/arm64]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata for Worker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/ldo-cert/orochi_worker
-
-      - name: Build and push Worker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./compose/local/dask/Dockerfile
-          platforms: ${{ matrix.platform }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            TARGETPLATFORM=${{ matrix.platform }}
-            BUILDPLATFORM=${{ runner.os }}
-
-  build_nginx:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [linux/amd64, linux/arm64]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -120,6 +46,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
         with:
           install: true
+          driver-opts: image=moby/buildkit:master
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
@@ -128,18 +55,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata for Nginx
+      - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/ldo-cert/orochi_nginx
+          images: ${{ matrix.image }}
 
-      - name: Build and push Nginx image
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./compose/local/nginx/Dockerfile
-          platforms: ${{ matrix.platform }}
+          file: ${{ matrix.file }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}