From c293643629a50fd9f77451ca76c34181b7be4f9e Mon Sep 17 00:00:00 2001
From: Dennis Haney <davh@voxmeter.dk>
Date: Wed, 10 Jul 2024 16:30:40 +0700
Subject: [PATCH] fix: simplify build

---
 .github/workflows/build.yaml | 10 ++++++----
 Dockerfile                   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d4b5c09..1e1238d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,12 +11,14 @@ concurrency:
 jobs:
   Build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform: [amd64, arm64]
     steps:
     - name: Checkout
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
     - name: Log in to the Container registry
       uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3
       with:
@@ -33,7 +35,7 @@ jobs:
       with:
         #only push for main branch
         push: ${{ github.ref == 'refs/heads/main' }}
-        platforms: linux/${{ matrix.platform }}
+        platforms: linux/amd64,linux/arm64
         labels: |
           org.opencontainers.image.title=Voxmeter MariaDB
           org.opencontainers.image.description=Voxmeter MariaDB
diff --git a/Dockerfile b/Dockerfile
index 79a0179..2f20890 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM bitnami/mariadb:11.2.4-debian-12-r4
 
 USER 0
-COPY --chown=root:root --chmod=555 ./backup.sh /usr/local/bin
 RUN install_packages zstd awscli
+COPY --chown=0:0 --chmod=555 ./backup.sh /usr/local/bin
 USER 1001