Merge remote-tracking branch 'origin/master'

Author: LenBanana

.github/workflows/dockercontainer-build.yml

@@ -1,58 +1,52 @@
 name: Docker
-
 on:
   push:
     # Publish `master` as Docker `latest` image.
     branches:
       - master
-
     # Publish `v1.2.3` tags as releases.
     tags:
       - v*
-
   # Run tests for any PRs.
   pull_request:
-
 env:
   # TODO: Change variable to your image's name.
   IMAGE_NAME: syncstreamapi
-
 jobs:
   # Run tests.
   # See also https://docs.docker.com/docker-hub/builds/automated-testing/
   test:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Run tests
         run: |
           if [ -f docker-compose.test.yml ]; then
             docker-compose --file docker-compose.test.yml build
             docker-compose --file docker-compose.test.yml run sut
           else
-            docker build . --file Dockerfile
+            docker buildx build . --file Dockerfile --platform linux/amd64,linux/arm64
           fi
   # Push image to GitHub Packages.
   # See also https://docs.docker.com/docker-hub/builds/
   push:
     # Ensure test job passes before pushing image.
     needs: test
-
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
-
     steps:
       - uses: actions/checkout@v2
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Log into registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
+      - name: Build and push image
         run: |
           IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
           
@@ -66,5 +60,10 @@ jobs:
           [ "$VERSION" == "master" ] && VERSION=latest
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          
+          # Build and push multi-arch image
+          docker buildx build . \
+            --platform linux/amd64,linux/arm64 \
+            --file Dockerfile \
+            --tag $IMAGE_ID:$VERSION \
+            --push