From c4b5af46d0490a6e0230e0d208a6279cb1d4d31c Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 10 Jun 2023 16:27:30 -0700
Subject: [PATCH] docker: Fix arch detection on pi builders

---
 install/docker/Dockerfile.s6 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/docker/Dockerfile.s6 b/install/docker/Dockerfile.s6
index be8ff91bb2..f0d0db008c 100644
--- a/install/docker/Dockerfile.s6
+++ b/install/docker/Dockerfile.s6
@@ -15,10 +15,11 @@ COPY fs /
 ARG S6_OVERLAY_VERSION=3.1.1.2
 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 ENV S6_KEEP_ENV=1
-RUN case "$(uname -m)" in \
-    x86_64) S6_ARCH='x86_64';; \
-    armv7l) S6_ARCH='armhf';; \
-    aarch64) S6_ARCH='aarch64';; \
+ARG TARGETARCH
+RUN case "${TARGETARCH}" in \
+    x86_64) S6_ARCH='amd64';; \
+    armv7l) S6_ARCH='arm';; \
+    aarch64) S6_ARCH='arm64';; \
     *) echo "Your system architecture isn't supported."; exit 1 ;; \
     esac \
   && cd /tmp \