Merge pull request #56 from Zoey2936/patch-1

build arm on native arm runner to improve build speed

Author: szaimen

.github/workflows/build_images.yml

@@ -8,15 +8,11 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  build-amd64:
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
-        platform: [
-          {arch: 'linux/amd64', tag: 'develop'},
-          {arch: 'linux/arm64', tag: 'develop-arm64'}]
         container: [
           {name: 'aio-apache', context: './Containers/apache'},
           {name: 'aio-borgbackup', context: './Containers/borgbackup'},
@@ -35,41 +31,62 @@ jobs:
           {name: 'aio-talk-recording', context: './Containers/talk-recording'},
           {name: 'aio-fulltextsearch', context: './Containers/fulltextsearch'},
           {name: 'aio-docker-socket-proxy', context: './Containers/docker-socket-proxy'},
-          {name: 'aio-whiteboard', context: './Containers/whiteboard'}]
-        exclude:
-          - platform: {arch: 'linux/arm64', tag: 'develop-arm64'}
-            container: {name: 'aio-clamav', context: './Containers/clamav'}
-
+          {name: 'aio-whiteboard', context: './Containers/whiteboard'}
+        ]
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
       - name: Login to DockerHub
         uses: docker/login-action@v2 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
-      - name: Docker metadata
-        id: metadata
-        uses: docker/metadata-action@v4
+      - name: Build docker image and push to dockerhub
+        uses: docker/build-push-action@v4
         with:
-          images: |
-            nextcloud/${{ matrix.container.name }}
-          tags: |
-            ${{ matrix.platform.tag }}
-
+          context: ${{ matrix.container.context }}
+          platforms: linux/amd64
+          no-cache: true
+          push: true
+          tags: nextcloud/${{ matrix.container.name }}:develop
+          
+  build-arm64:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      fail-fast: false
+      matrix:
+        container: [
+          {name: 'aio-apache', context: './Containers/apache'},
+          {name: 'aio-borgbackup', context: './Containers/borgbackup'},
+          {name: 'aio-collabora', context: './Containers/collabora'},
+          {name: 'aio-domaincheck', context: './Containers/domaincheck'},
+          {name: 'all-in-one', context: './Containers/mastercontainer'},
+          {name: 'aio-nextcloud', context: './Containers/nextcloud'},
+          {name: 'aio-notify-push', context: './Containers/notify-push'},
+          {name: 'aio-postgresql', context: './Containers/postgresql'},
+          {name: 'aio-redis', context: './Containers/redis'},
+          {name: 'aio-talk', context: './Containers/talk'},
+          {name: 'aio-watchtower', context: './Containers/watchtower'},
+          {name: 'aio-onlyoffice', context: './Containers/onlyoffice'},
+          {name: 'aio-imaginary', context: './Containers/imaginary'},
+          {name: 'aio-talk-recording', context: './Containers/talk-recording'},
+          {name: 'aio-fulltextsearch', context: './Containers/fulltextsearch'},
+          {name: 'aio-docker-socket-proxy', context: './Containers/docker-socket-proxy'},
+          {name: 'aio-whiteboard', context: './Containers/whiteboard'}
+        ]
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build docker image and push to dockerhub
         uses: docker/build-push-action@v4
         with:
           context: ${{ matrix.container.context }}
-          platforms: ${{matrix.platform.arch}}
+          platforms: linux/arm64
           no-cache: true
           push: true
-          tags: ${{ steps.metadata.outputs.tags }}
+          tags: nextcloud/${{ matrix.container.name }}:develop-arm64