From 8f9554b5b9395c8d0b862d31f70420f7650ebab5 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 8 Apr 2022 14:31:32 -0400
Subject: [PATCH] Build rust docker images for linux/amd64

---
 ci/docker-rust-nightly/build.sh | 8 +++++++-
 ci/docker-rust/build.sh         | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ci/docker-rust-nightly/build.sh b/ci/docker-rust-nightly/build.sh
index 45da0a43f..dad7221e5 100755
--- a/ci/docker-rust-nightly/build.sh
+++ b/ci/docker-rust-nightly/build.sh
@@ -3,8 +3,14 @@ set -ex
 
 cd "$(dirname "$0")"
 
+platform=()
+if [[ $(uname -m) = arm64 ]]; then
+  # Ref: https://blog.jaimyn.dev/how-to-build-multi-architecture-docker-images-on-an-m1-mac/#tldr
+  platform+=(--platform linux/amd64)
+fi
+
 nightlyDate=${1:-$(date +%Y-%m-%d)}
-docker build -t solanalabs/rust-nightly:"$nightlyDate" --build-arg date="$nightlyDate" .
+docker build "${platform[@]}" -t solanalabs/rust-nightly:"$nightlyDate" --build-arg date="$nightlyDate" .
 
 maybeEcho=
 if [[ -z $CI ]]; then
diff --git a/ci/docker-rust/build.sh b/ci/docker-rust/build.sh
index c5422f7c4..360bbbcbe 100755
--- a/ci/docker-rust/build.sh
+++ b/ci/docker-rust/build.sh
@@ -3,7 +3,14 @@ set -ex
 
 cd "$(dirname "$0")"
 
-docker build -t solanalabs/rust .
+
+platform=()
+if [[ $(uname -m) = arm64 ]]; then
+  # Ref: https://blog.jaimyn.dev/how-to-build-multi-architecture-docker-images-on-an-m1-mac/#tldr
+  platform+=(--platform linux/amd64)
+fi
+
+docker build "${platform[@]}" -t solanalabs/rust .
 
 read -r rustc version _ < <(docker run solanalabs/rust rustc --version)
 [[ $rustc = rustc ]]