From 0608bcafbfe780c6fc6de9be539e46ba73b37110 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Thu, 25 Apr 2024 16:26:41 +0200
Subject: [PATCH 1/2] chore: fix update script for mac silicon

---
 functions.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/functions.sh b/functions.sh
index df1883f73..e03cf874d 100755
--- a/functions.sh
+++ b/functions.sh
@@ -32,6 +32,9 @@ function get_arch() {
     s390x)
       arch="s390x"
       ;;
+    arm64)
+      arch="amd64"
+      ;;
     aarch64)
       arch="arm64"
       ;;

From 8739d1ef1a30a7910331ebfd979b6361eeb47b61 Mon Sep 17 00:00:00 2001
From: Laurent Goderre <laurent.goderre@docker.com>
Date: Tue, 14 May 2024 10:25:27 -0400
Subject: [PATCH 2/2] fixup

---
 functions.sh | 7 ++-----
 update.sh    | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index e03cf874d..bee3dafe0 100755
--- a/functions.sh
+++ b/functions.sh
@@ -32,17 +32,14 @@ function get_arch() {
     s390x)
       arch="s390x"
       ;;
-    arm64)
-      arch="amd64"
-      ;;
-    aarch64)
+    aarch64 | arm64)
       arch="arm64"
       ;;
     armv7l)
       arch="arm32v7"
       ;;
     *)
-      echo "$0 does not support architecture ${arch} ... aborting"
+      echo "$0 does not support architecture ${arch:-unknown} ... aborting"
       exit 1
       ;;
   esac
diff --git a/update.sh b/update.sh
index 9a321c800..cbdaa9a0d 100755
--- a/update.sh
+++ b/update.sh
@@ -126,7 +126,7 @@ function update_node_version() {
   (
     cp "${template}" "${dockerfile}-tmp"
     local fromprefix=""
-    if [ "${arch}" != "amd64" ]; then
+    if [ "${arch}" != "amd64" ] && [ "${arch}" != "arm64" ]; then
       fromprefix="${arch}\\/"
     fi