From 77632ac15fe49da154bae284161752ce7a262329 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 28 Jun 2021 18:36:21 -0700 Subject: [PATCH] Dockerfile: enable windows/arm64 Signed-off-by: Tonis Tiigi --- .github/workflows/build.yml | 4 ++-- Dockerfile | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db1519e2717..20d72278cbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: run: | make cross env: - TARGETPLATFORM: ${{ env.PLATFORMS }},darwin/amd64,darwin/arm64,windows/amd64 + TARGETPLATFORM: ${{ env.PLATFORMS }},darwin/amd64,darwin/arm64,windows/amd64,windows/arm64 CACHEDIR_FROM: /tmp/.buildx-cache/${{ env.CACHEKEY_BINARIES }} binaries: @@ -160,7 +160,7 @@ jobs: run: | ./hack/release "${{ steps.prep.outputs.tag }}" release-out env: - PLATFORMS: ${{ env.PLATFORMS }},darwin/amd64,darwin/arm64,windows/amd64 + PLATFORMS: ${{ env.PLATFORMS }},darwin/amd64,darwin/arm64,windows/amd64,windows/arm64 CACHEDIR_FROM: /tmp/.buildx-cache/${{ env.CACHEKEY_BINARIES }} - name: Move artifacts diff --git a/Dockerfile b/Dockerfile index 5f6323dc79d..af102ba1166 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,17 @@ FROM docker:$DOCKERD_VERSION AS dockerd-release # xx is a helper for cross-compilation FROM --platform=$BUILDPLATFORM tonistiigi/xx@sha256:21a61be4744f6531cb5f33b0e6f40ede41fa3a1b8c82d5946178f80cc84bfc04 AS xx -FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS gobase +FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS golatest + +FROM golatest AS go-linux +FROM golatest AS go-darwin +FROM golatest AS go-windows-amd64 +FROM golatest AS go-windows-386 +FROM golatest AS go-windows-arm +FROM --platform=$BUILDPLATFORM golang:1.17beta1-alpine AS go-windows-arm64 +FROM go-windows-${TARGETARCH} AS go-windows + +FROM go-${TARGETOS} AS gobase COPY --from=xx / / RUN apk add --no-cache file git ENV GOFLAGS=-mod=vendor