Fix multiarch build

mattermost · Feb 28, 2025 · 4b27f88 · 4b27f88
1 parent b4b213b
commit 4b27f88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -22,7 +22,7 @@ FROM --platform=$TARGETPLATFORM golang:${GO_VERSION}-bookworm AS builder
 # Install patch
 # hadolint ignore=DL3008
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y patch
+    apt-get install --no-install-recommends -y patch ccache
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/build/prepare_deps.sh b/build/prepare_deps.sh
@@ -13,12 +13,13 @@ AZURE_SDK_SHA=$9
 IS_BUILD=${10}
 ONNX_ARCH=x64
 ONNX_SHA=a0994512ec1e1debc00c18bfc7a5f16249f6ebd6a6128ff2034464cc380ea211
+UNAME_M=$(uname -m)
 if [ "$TARGET_ARCH" == "arm64" ]; then
 	ONNX_ARCH=aarch64
 	ONNX_SHA=c1dcd8ab29e8d227d886b6ee415c08aea893956acf98f0758a42a84f27c02851
+	UNAME_M="arm64"
 fi
 
-UNAME_M=$(uname -m)
 if [ "$IS_M1" == "true" ]; then
 	echo "Overriding UNAME_M on detected M1 host";
 	UNAME_M="arm64"