From 440c89bf9886564b83bc500a3f14b89b8e2e7beb Mon Sep 17 00:00:00 2001
From: Kian Dadban <kiandadban1@gmail.com>
Date: Wed, 19 Aug 2026 13:53:20 -0700
Subject: [PATCH 1/2] fix: support ARM64 hosts in attacker Dockerfile mongosh
 install by downloading the arm64 mongosh binary on ARM64 build hosts instead
 of always fetching x64

---
 docker/attacker/Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker/attacker/Dockerfile b/docker/attacker/Dockerfile
index 4f1bff0..c014027 100644
--- a/docker/attacker/Dockerfile
+++ b/docker/attacker/Dockerfile
@@ -39,10 +39,12 @@ RUN apt-get update && \
 # so pinned versions stay downloadable. To upgrade: bump MONGOSH_VERSION.
 # Needed by: mongodb_disable_auth, database_expose atoms.
 ARG MONGOSH_VERSION=2.3.1
-RUN wget -q "https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-x64.tgz" \
-        -O /tmp/mongosh.tgz \
+ARG TARGETARCH
+RUN ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "arm64" || echo "x64") && \
+    wget -q "https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${ARCH}.tgz" \
+    -O /tmp/mongosh.tgz \
     && tar -xzf /tmp/mongosh.tgz -C /tmp \
-    && mv "/tmp/mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh" /usr/local/bin/mongosh \
+    && mv "/tmp/mongosh-${MONGOSH_VERSION}-linux-${ARCH}/bin/mongosh" /usr/local/bin/mongosh \
     && chmod +x /usr/local/bin/mongosh \
     && rm -rf /tmp/mongosh* \
     && mongosh --version

From 2107de97f58e959abdf57bed8cef6fc991fb42de Mon Sep 17 00:00:00 2001
From: Kian Dadban <kiandadban1@gmail.com>
Date: Wed, 19 Aug 2026 19:15:22 -0700
Subject: [PATCH 2/2] fix: use uname -m instead of TARGETARCH for arch
 detection

GoE's Python docker SDK calls images.build() without BuildKit, so TARGETARCH was always
unset and the ARM64 fix never activated. uname -m works regardless of build backend.
---
 docker/attacker/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/attacker/Dockerfile b/docker/attacker/Dockerfile
index c014027..fa8d2eb 100644
--- a/docker/attacker/Dockerfile
+++ b/docker/attacker/Dockerfile
@@ -39,12 +39,12 @@ RUN apt-get update && \
 # so pinned versions stay downloadable. To upgrade: bump MONGOSH_VERSION.
 # Needed by: mongodb_disable_auth, database_expose atoms.
 ARG MONGOSH_VERSION=2.3.1
-ARG TARGETARCH
-RUN ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "arm64" || echo "x64") && \
-    wget -q "https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${ARCH}.tgz" \
-    -O /tmp/mongosh.tgz \
+RUN ARCH=$(uname -m) && \
+    if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then MONGOSH_ARCH="arm64"; else MONGOSH_ARCH="x64"; fi && \
+    wget -q "https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${MONGOSH_ARCH}.tgz" \
+        -O /tmp/mongosh.tgz \
     && tar -xzf /tmp/mongosh.tgz -C /tmp \
-    && mv "/tmp/mongosh-${MONGOSH_VERSION}-linux-${ARCH}/bin/mongosh" /usr/local/bin/mongosh \
+    && mv "/tmp/mongosh-${MONGOSH_VERSION}-linux-${MONGOSH_ARCH}/bin/mongosh" /usr/local/bin/mongosh \
     && chmod +x /usr/local/bin/mongosh \
     && rm -rf /tmp/mongosh* \
     && mongosh --version