From 26893396efbf74a73360d40efc2a52da99fa483a Mon Sep 17 00:00:00 2001
From: Sayan Samanta <sayan@onkernel.com>
Date: Fri, 22 May 2026 12:37:26 -0700
Subject: [PATCH] fix local

---
 images/chromium-headful/build-docker.sh  | 2 +-
 images/chromium-headful/run-docker.sh    | 1 +
 images/chromium-headless/build-docker.sh | 2 +-
 images/chromium-headless/run-docker.sh   | 1 +
 shared/ensure-common-build-run-vars.sh   | 6 ++++++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/images/chromium-headful/build-docker.sh b/images/chromium-headful/build-docker.sh
index c2cd3320..8f78abf9 100755
--- a/images/chromium-headful/build-docker.sh
+++ b/images/chromium-headful/build-docker.sh
@@ -10,4 +10,4 @@ source ../../shared/start-buildkit.sh
 
 # Build the Docker image using the repo root as build context
 # so the Dockerfile's first stage can access the server sources
-(cd "$SCRIPT_DIR/../.." && docker build -f images/chromium-headful/Dockerfile -t "$IMAGE" .)
+(cd "$SCRIPT_DIR/../.." && docker build --platform "$DOCKER_PLATFORM" -f images/chromium-headful/Dockerfile -t "$IMAGE" .)
diff --git a/images/chromium-headful/run-docker.sh b/images/chromium-headful/run-docker.sh
index 0c1255d7..9e5af0ae 100755
--- a/images/chromium-headful/run-docker.sh
+++ b/images/chromium-headful/run-docker.sh
@@ -52,6 +52,7 @@ cat "$FLAGS_FILE"
 # Build docker run argument list
 RUN_ARGS=(
   --name "$NAME"
+  --platform "$DOCKER_PLATFORM"
   --privileged
   --tmpfs /dev/shm:size=2g
   -v "$HOST_RECORDINGS_DIR:/recordings"
diff --git a/images/chromium-headless/build-docker.sh b/images/chromium-headless/build-docker.sh
index e616f528..f634c015 100755
--- a/images/chromium-headless/build-docker.sh
+++ b/images/chromium-headless/build-docker.sh
@@ -10,4 +10,4 @@ source ../../shared/start-buildkit.sh
 
 # Build the Docker image using the repo root as build context
 # so the Dockerfile's first stage can access the server sources
-(cd "$SCRIPT_DIR/../.." && docker build -f images/chromium-headless/image/Dockerfile -t "$IMAGE" .)
+(cd "$SCRIPT_DIR/../.." && docker build --platform "$DOCKER_PLATFORM" -f images/chromium-headless/image/Dockerfile -t "$IMAGE" .)
diff --git a/images/chromium-headless/run-docker.sh b/images/chromium-headless/run-docker.sh
index 4a670748..faac5e9f 100755
--- a/images/chromium-headless/run-docker.sh
+++ b/images/chromium-headless/run-docker.sh
@@ -12,6 +12,7 @@ mkdir -p "$HOST_RECORDINGS_DIR"
 
 RUN_ARGS=(
   --name "$NAME"
+  --platform "$DOCKER_PLATFORM"
   --privileged
   --tmpfs /dev/shm:size=2g
   -p 9222:9222
diff --git a/shared/ensure-common-build-run-vars.sh b/shared/ensure-common-build-run-vars.sh
index f7627a0d..f73ab1d9 100644
--- a/shared/ensure-common-build-run-vars.sh
+++ b/shared/ensure-common-build-run-vars.sh
@@ -16,6 +16,12 @@ NAME="${NAME:-${IMAGE_TYPE}-test}"
 
 UKC_INDEX="${UKC_INDEX:-index.unikraft.io}"
 
+# Chrome-for-Testing only ships linux/amd64 binaries, so both images must be
+# built and run for amd64 even on arm64 hosts (Apple Silicon). Docker Desktop
+# will emulate via Rosetta. Override with DOCKER_PLATFORM=linux/arm64 only if
+# you have a compatible chromium baked into a custom Dockerfile.
+DOCKER_PLATFORM="${DOCKER_PLATFORM:-linux/amd64}"
+
 # Only require UKC_TOKEN and UKC_METRO when explicitly requested
 # Pass "require-ukc-vars" as second argument to enable this check
 REQUIRE_UKC_VARS="${2:-}"