Multiarch fixes [stage]

.github/workflows/docker-push.yml

@@ -51,35 +51,19 @@ jobs:
             latest=${{ contains(github.event.head_commit.message, '[release]') == true }}
           tags: |
             type=raw,value=${{ env.XPIPE_TAG }}
-      - name: Build and push Docker image (amd64)
+      - name: Build and push Docker image
         id: push
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: .
-          file: ./Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             "XPIPE_VERSION=${{ env.XPIPE_VERSION }}"
             "XPIPE_REPOSITORY=${{ env.XPIPE_REPOSITORY }}"
             "XPIPE_PACKAGE=${{ env.XPIPE_PACKAGE }}"
-          platforms: linux/amd64
-      - name: Build and push Docker image (arm64)
-        id: push
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
-        with:
-          context: .
-          file: ./Dockerfile.aarch64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            "XPIPE_VERSION=${{ env.XPIPE_VERSION }}"
-            "XPIPE_REPOSITORY=${{ env.XPIPE_REPOSITORY }}"
-            "XPIPE_PACKAGE=${{ env.XPIPE_PACKAGE }}"
-          platforms: linux/arm64
-          if: contains(github.event.head_commit.message, '[release]')
+          platforms: linux/amd64,linux/arm64
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:

Dockerfile

@@ -1,5 +1,12 @@
-ARG START_DOCKER=false
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
+FROM scratch AS base
+
+FROM base AS build-arm64
+ENV BASE_IMAGE_TAG=arm64v8-ubuntunoble
+
+FROM base AS build-amd64
+ENV BASE_IMAGE_TAG=ubuntunoble
+
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:${BASE_IMAGE_TAG}
 
 ARG DEBIAN_FRONTEND="noninteractive"