From 3b799ba58a3cf9e6b0136817350196dd56e6275a Mon Sep 17 00:00:00 2001
From: Cian Johnston <cian@coder.com>
Date: Fri, 8 Sep 2023 11:32:07 +0100
Subject: [PATCH 1/2] fix(scripts): modify logic for determining terraform arch

Commit fb3616c used a build-arg to set the desired terrafomr
architeture to fetch. This is set in build_docker.sh but not
when building using depot.dev. Baking the logic into the
Dockerfile instead.
---
 scripts/Dockerfile.base |  4 +---
 scripts/build_docker.sh |  2 --
 scripts/tfarch.sh       | 10 ++++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100755 scripts/tfarch.sh

diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base
index 80fc9a8c41d70..22d57e4184c89 100644
--- a/scripts/Dockerfile.base
+++ b/scripts/Dockerfile.base
@@ -25,13 +25,11 @@ RUN apk add --no-cache \
 # Terraform was disabled in the edge repo due to a build issue.
 # https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35
 # Using wget for now. Note that busybox unzip doesn't support streaming.
-ARG ARCH
-RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.5.6/terraform_1.5.6_linux_${ARCH}.zip" && \
+RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.5.6/terraform_1.5.6_linux_${ARCH}.zip" && \
 		busybox unzip /tmp/terraform.zip -d /usr/local/bin && \
 		rm -f /tmp/terraform.zip && \
 		chmod +x /usr/local/bin/terraform && \
 		terraform --version
-
 USER 1000:1000
 ENV HOME=/home/coder
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt
diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh
index af3ff6a21e711..1bee954e9713c 100755
--- a/scripts/build_docker.sh
+++ b/scripts/build_docker.sh
@@ -103,7 +103,6 @@ declare -A arch_map=(
 	[arm]="linux/arm/v7"
 	[armv7]="linux/arm/v7"
 )
-orig_arch="$arch"
 if [[ "${arch_map[$arch]+exists}" != "" ]]; then
 	arch="${arch_map[$arch]}"
 fi
@@ -125,7 +124,6 @@ if [[ "$build_base" != "" ]]; then
 	log "--- Building base Docker image for $arch ($build_base)"
 	docker build \
 		--platform "$arch" \
-		--build-arg "ARCH=${orig_arch}" \
 		--tag "$build_base" \
 		--no-cache \
 		-f Dockerfile.base \
diff --git a/scripts/tfarch.sh b/scripts/tfarch.sh
new file mode 100755
index 0000000000000..a14573dd2df99
--- /dev/null
+++ b/scripts/tfarch.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+arch=$(arch)
+if [ "$arch" = "x86_64" ]; then
+	arch="amd64"
+elif [ "$arch" = "aarch64" ]; then
+	arch="arm64"
+fi
+printf "%s" "$arch"

From 146400b0671dfa4deb79f3905cf7ccf4a886a23d Mon Sep 17 00:00:00 2001
From: Cian Johnston <cian@coder.com>
Date: Fri, 8 Sep 2023 11:34:49 +0100
Subject: [PATCH 2/2] fixup! fix(scripts): modify logic for determining
 terraform arch

---
 scripts/tfarch.sh | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100755 scripts/tfarch.sh

diff --git a/scripts/tfarch.sh b/scripts/tfarch.sh
deleted file mode 100755
index a14573dd2df99..0000000000000
--- a/scripts/tfarch.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-arch=$(arch)
-if [ "$arch" = "x86_64" ]; then
-	arch="amd64"
-elif [ "$arch" = "aarch64" ]; then
-	arch="arm64"
-fi
-printf "%s" "$arch"