From 760fe9a31f10f3ef831c9cdfc874fd7d0ee7d725 Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 15 Oct 2024 00:45:28 +0200 Subject: [PATCH] feat: Include ARM64 version in image (#812) --- .github/workflows/build.yml | 4 ++-- Dockerfile | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6e2cf1..8731ab4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: labels: | org.opencontainers.image.title=${{ vars.NAME }} env: - DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index + DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -74,7 +74,7 @@ jobs: context: . push: true provenance: false - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} annotations: ${{ steps.meta.outputs.annotations }} diff --git a/Dockerfile b/Dockerfile index a8e4197..22a73af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM scratch +FROM scratch AS build-amd64 COPY --from=qemux/qemu-docker:6.05 / / ARG VERSION_ARG="0.0" @@ -31,6 +31,9 @@ COPY --chmod=755 ./assets /run/assets ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/v0.8/src/wsdd.py /usr/sbin/wsdd ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.43-0/virtio-win-1.9.43.tar.xz /drivers.txz +FROM dockurr/windows-arm:2.20 AS build-arm64 +FROM build-${TARGETARCH} + EXPOSE 8006 3389 VOLUME /storage