From 0315c999fe542c7069a5af7064bd4ddb9d82a6b6 Mon Sep 17 00:00:00 2001
From: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Date: Mon, 11 Jul 2022 08:48:07 -0700
Subject: [PATCH] fix: support building docker images on M1 (#2250)

Now developers on the M1 can use
DEV_DOCKER_GOARCH=arm64 make docker-build-dev
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d15484bcc6..eeded85215 100644
--- a/Makefile
+++ b/Makefile
@@ -316,10 +316,13 @@ docker-multiarch-build:
 		--platform linux/amd64,linux/arm64 \
 		.
 
+DEV_DOCKER_GOOS ?= linux
+DEV_DOCKER_GOARCH ?= amd64
+
 .PHONY: docker-build-dev
 # Builds from the locally generated binary in ./bin/
-docker-build-dev: export GOOS=linux
-docker-build-dev: export GOARCH=amd64
+docker-build-dev: export GOOS=$(DEV_DOCKER_GOOS)
+docker-build-dev: export GOARCH=$(DEV_DOCKER_GOARCH)
 docker-build-dev: build
 	docker build \
 		--tag $(IMAGE_TAG_DEV) \