From a2a1de5f0e14471ea8dabc745eabd5d3d8e10fe9 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Fri, 5 Mar 2021 01:05:04 -0800
Subject: [PATCH] add windows/arm64 target

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 Dockerfile      | 6 +++++-
 docker-bake.hcl | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 13ff22d41b..719b0873aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,12 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable
 FROM --platform=$BUILDPLATFORM golang:1.16-${BASE_VARIANT} AS golatest	
 
 FROM gostable AS go-linux	
-FROM golatest AS go-windows
 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 tonistiigi/golang:497feff1-${BASE_VARIANT} AS go-windows-arm64
+FROM go-windows-${TARGETARCH} AS go-windows
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx@sha256:620d36a9d7f1e3b102a5c7e8eff12081ac363828b3a44390f24fa8da2d49383d AS xx
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 0fb3fe2bec..d450aaf29b 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -33,7 +33,7 @@ target "dynbinary" {
 }
 
 target "_all_platforms" {
-    platforms = ["linux/amd64", "linux/386", "linux/arm64", "linux/arm", "linux/ppc64le", "linux/s390x", "darwin/amd64", "darwin/arm64", "windows/amd64", "windows/arm", "windows/386"]
+    platforms = concat(["linux/amd64", "linux/386", "linux/arm64", "linux/arm", "linux/ppc64le", "linux/s390x", "darwin/amd64", "darwin/arm64", "windows/amd64", "windows/arm", "windows/386"], USE_GLIBC!=""?[]:["windows/arm64"])
 }
 
 target "cross" {