From e16a7363e75f758d4c22a4c72e1f61af9876a36b Mon Sep 17 00:00:00 2001
From: Daniel Aloni <daniel@globekeeper.com>
Date: Wed, 15 Mar 2023 18:20:02 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Declaring=20BUILDPLATFORM=20befo?=
 =?UTF-8?q?re=20usage=20on=20Dockerfile=20+=20default=20substitution?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cloudbuild/dev.yaml | 2 ++
 Dockerfile           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.cloudbuild/dev.yaml b/.cloudbuild/dev.yaml
index 652d69d4e..501116ee2 100644
--- a/.cloudbuild/dev.yaml
+++ b/.cloudbuild/dev.yaml
@@ -7,6 +7,8 @@ steps:
       - CLOUDSDK_CORE_PROJECT=globekeeper-development
       - CLOUDSDK_COMPUTE_ZONE=europe-west2-a
       - CLOUDSDK_CONTAINER_CLUSTER=synapse
+substitutions:
+  _BUILD_PLATFORM: linux/amd64 # default
 images:
   - gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA
 timeout: 480s
diff --git a/Dockerfile b/Dockerfile
index 76c7b7785..f09e767b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 #
 # base installs required dependencies and runs go mod download to cache dependencies
 #
+ARG BUILDPLATFORM=${BUILDPLATFORM}
 FROM --platform=${BUILDPLATFORM} docker.io/golang:1.20-alpine AS base
 RUN apk --update --no-cache add bash build-base curl