From 883000521e072f1c22489753f64a98f03495a7ec Mon Sep 17 00:00:00 2001
From: Anderson Queiroz <anderson.queiroz@elastic.co>
Date: Tue, 26 Apr 2022 15:03:43 +0200
Subject: [PATCH] wip

---
 go/Makefile.common              | 4 +++-
 go/darwin-arm64/Dockerfile.tmpl | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/go/Makefile.common b/go/Makefile.common
index 8f717e9e..4760d7cc 100644
--- a/go/Makefile.common
+++ b/go/Makefile.common
@@ -27,7 +27,9 @@ build-arm:
 	@echo $(SELF_DIR)
 	@echo ">> Building $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@go run $(SELF_DIR)/../template.go -t Dockerfile.tmpl -o Dockerfile
-	@docker build -t "$(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)" \
+	docker build \
+	--platform linux/arm64 \
+	-t "$(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)" \
 	--build-arg REPOSITORY=$(REPOSITORY) \
 	--build-arg VERSION=$(VERSION) \
 	--build-arg DEBIAN_VERSION=$(DEBIAN_VERSION) \
diff --git a/go/darwin-arm64/Dockerfile.tmpl b/go/darwin-arm64/Dockerfile.tmpl
index b189c3d0..26098564 100644
--- a/go/darwin-arm64/Dockerfile.tmpl
+++ b/go/darwin-arm64/Dockerfile.tmpl
@@ -1,7 +1,7 @@
 ARG REPOSITORY
 ARG VERSION
 ARG TAG_EXTENSION=''
-FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base-arm${TAG_EXTENSION}
 
 RUN \
     apt-get -o Acquire::Check-Valid-Until=false update \