From f5d1a8a9e5511cdfad21e65774b81845ab00839c Mon Sep 17 00:00:00 2001
From: David Calavera <1050+calavera@users.noreply.github.com>
Date: Fri, 31 Jul 2026 14:58:53 -0700
Subject: [PATCH 1/3] Install CMake in runner image

---
 sandbox-image/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sandbox-image/Dockerfile b/sandbox-image/Dockerfile
index b748577..2ffb0cd 100644
--- a/sandbox-image/Dockerfile
+++ b/sandbox-image/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends \
     build-essential \
     ca-certificates \
+    cmake \
     curl \
     fuse3 \
     gzip \

From 4a2e38ae4e6747818a0b93acd25453ff875251d7 Mon Sep 17 00:00:00 2001
From: David Calavera <1050+calavera@users.noreply.github.com>
Date: Fri, 31 Jul 2026 15:14:09 -0700
Subject: [PATCH 2/3] Install runner build dependencies

---
 sandbox-image/Dockerfile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/sandbox-image/Dockerfile b/sandbox-image/Dockerfile
index 2ffb0cd..10a3795 100644
--- a/sandbox-image/Dockerfile
+++ b/sandbox-image/Dockerfile
@@ -4,13 +4,31 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
+    awscli \
+    binutils \
     build-essential \
     ca-certificates \
+    clang \
     cmake \
     curl \
+    e2fsprogs \
+    file \
     fuse3 \
+    gh \
+    git \
     gzip \
     jq \
+    libclang-dev \
+    libfuse3-dev \
+    libprotobuf-dev \
+    lld \
+    musl-tools \
+    nasm \
+    pipx \
+    protobuf-compiler \
+    python3-pip \
+    python3-pyelftools \
+    rsync \
     sudo \
     tar \
     util-linux \

From 9072024ed319c7a5947f50a1078124e0d41f4ae6 Mon Sep 17 00:00:00 2001
From: David Calavera <1050+calavera@users.noreply.github.com>
Date: Fri, 31 Jul 2026 15:21:33 -0700
Subject: [PATCH 3/3] Install AWS CLI v2 outside apt

---
 sandbox-image/Dockerfile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/sandbox-image/Dockerfile b/sandbox-image/Dockerfile
index 10a3795..3abf7ba 100644
--- a/sandbox-image/Dockerfile
+++ b/sandbox-image/Dockerfile
@@ -4,7 +4,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    awscli \
     binutils \
     build-essential \
     ca-certificates \
@@ -31,7 +30,21 @@ RUN apt-get update \
     rsync \
     sudo \
     tar \
+    unzip \
     util-linux \
+  && architecture="$(dpkg --print-architecture)" \
+  && case "${architecture}" in \
+    amd64) aws_arch="x86_64" ;; \
+    arm64) aws_arch="aarch64" ;; \
+    *) echo "unsupported architecture for AWS CLI: ${architecture}" >&2; exit 2 ;; \
+  esac \
+  && curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" \
+    -o /tmp/awscliv2.zip \
+  && unzip -q /tmp/awscliv2.zip -d /tmp/awscliv2 \
+  && /tmp/awscliv2/aws/install \
+  && rm -r /tmp/awscliv2 \
+  && rm /tmp/awscliv2.zip \
+  && aws --version \
   && install -m 0755 -d /etc/apt/keyrings \
   && curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \
   && chmod a+r /etc/apt/keyrings/docker.asc \