From 1a390ddb5d43b375e0ae5d05ba289d3cf8bdccaa Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Wed, 22 Jun 2022 19:34:27 -0400
Subject: [PATCH 01/14] Start messing with arm

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6088257a38e..e74fccbeb72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -190,7 +190,7 @@ services:
       test: ["CMD-SHELL", "nc -z localhost 9092"]
   clickhouse:
     <<: *restart_policy
-    image: "yandex/clickhouse-server:20.3.9.70"
+    image: "altinity/clickhouse-server:21.6.1.6734-testing-arm"
     ulimits:
       nofile:
         soft: 262144

From 4072867f4e0b654dfc902bfe4f36da73c8ace34f Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Wed, 22 Jun 2022 20:27:45 -0400
Subject: [PATCH 02/14] Keep messing with ARM

---
 .env                                  | 12 ++++++++++++
 docker-compose.yml                    |  2 +-
 install/check-minimum-requirements.sh | 11 -----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index acb4ee80410..548e137d5ca 100644
--- a/.env
+++ b/.env
@@ -9,6 +9,18 @@ SENTRY_IMAGE=getsentry/sentry:nightly
 SNUBA_IMAGE=getsentry/snuba:nightly
 RELAY_IMAGE=getsentry/relay:nightly
 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
+
+# Sentry SaaS uses stock Yandex ClickHouse, but they don't provide images that
+# support ARM, which is relevant especially for Apple M1 laptops, Sentry's
+# standard developer environment. As a workaround, you can manually toggle the
+# following to get an ARM build from an alternative-but-reputable vendor.
+
+# See https://github.com/getsentry/self-hosted/issues/1385#issuecomment-1101824274
+
+CLICKHOUSE_IMAGE=yandex/clickhouse-server:20.3.9.70
+#CLICKHOUSE_IMAGE=altinity/clickhouse-server:20.10.1.4844-testing-arm
+# tl;dr ^^^ Uncomment this on ARM.
+
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s
diff --git a/docker-compose.yml b/docker-compose.yml
index e74fccbeb72..e9966fb1e7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -190,7 +190,7 @@ services:
       test: ["CMD-SHELL", "nc -z localhost 9092"]
   clickhouse:
     <<: *restart_policy
-    image: "altinity/clickhouse-server:21.6.1.6734-testing-arm"
+    image: "$CLICKHOUSE_IMAGE"
     ulimits:
       nofile:
         soft: 262144
diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh
index 61484d35efe..9b7b57c568c 100644
--- a/install/check-minimum-requirements.sh
+++ b/install/check-minimum-requirements.sh
@@ -36,15 +36,4 @@ elif [[ "$RAM_AVAILABLE_IN_DOCKER" -lt "$MIN_RAM_SOFT" ]]; then
   echo "WARN: Recommended minimum RAM available to Docker is $MIN_RAM_SOFT MB, found $RAM_AVAILABLE_IN_DOCKER MB"
 fi
 
-#SSE4.2 required by Clickhouse (https://clickhouse.yandex/docs/en/operations/requirements/)
-# On KVM, cpuinfo could falsely not report SSE 4.2 support, so skip the check. https://github.com/ClickHouse/ClickHouse/issues/20#issuecomment-226849297
-IS_KVM=$(docker run --rm busybox grep -c 'Common KVM processor' /proc/cpuinfo || :)
-if [[ "$IS_KVM" -eq 0 ]]; then
-  SUPPORTS_SSE42=$(docker run --rm busybox grep -c sse4_2 /proc/cpuinfo || :)
-  if [[ "$SUPPORTS_SSE42" -eq 0 ]]; then
-    echo "FAIL: The CPU your machine is running on does not support the SSE 4.2 instruction set, which is required for one of the services Sentry uses (Clickhouse). See https://github.com/getsentry/self-hosted/issues/340 for more info."
-    exit 1
-  fi
-fi
-
 echo "${_endgroup}"

From 357160b1fd910614a2b79b05718c1952b3719a8b Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Wed, 22 Jun 2022 19:34:27 -0400
Subject: [PATCH 03/14] Start messing with arm

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6088257a38e..e74fccbeb72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -190,7 +190,7 @@ services:
       test: ["CMD-SHELL", "nc -z localhost 9092"]
   clickhouse:
     <<: *restart_policy
-    image: "yandex/clickhouse-server:20.3.9.70"
+    image: "altinity/clickhouse-server:21.6.1.6734-testing-arm"
     ulimits:
       nofile:
         soft: 262144

From c5315b530e168096b4f83d75425edbc8ee1a0a23 Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Wed, 22 Jun 2022 20:27:45 -0400
Subject: [PATCH 04/14] Keep messing with ARM

---
 .env                                  | 12 ++++++++++++
 docker-compose.yml                    |  2 +-
 install/check-minimum-requirements.sh | 11 -----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index acb4ee80410..548e137d5ca 100644
--- a/.env
+++ b/.env
@@ -9,6 +9,18 @@ SENTRY_IMAGE=getsentry/sentry:nightly
 SNUBA_IMAGE=getsentry/snuba:nightly
 RELAY_IMAGE=getsentry/relay:nightly
 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
+
+# Sentry SaaS uses stock Yandex ClickHouse, but they don't provide images that
+# support ARM, which is relevant especially for Apple M1 laptops, Sentry's
+# standard developer environment. As a workaround, you can manually toggle the
+# following to get an ARM build from an alternative-but-reputable vendor.
+
+# See https://github.com/getsentry/self-hosted/issues/1385#issuecomment-1101824274
+
+CLICKHOUSE_IMAGE=yandex/clickhouse-server:20.3.9.70
+#CLICKHOUSE_IMAGE=altinity/clickhouse-server:20.10.1.4844-testing-arm
+# tl;dr ^^^ Uncomment this on ARM.
+
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s
diff --git a/docker-compose.yml b/docker-compose.yml
index e74fccbeb72..e9966fb1e7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -190,7 +190,7 @@ services:
       test: ["CMD-SHELL", "nc -z localhost 9092"]
   clickhouse:
     <<: *restart_policy
-    image: "altinity/clickhouse-server:21.6.1.6734-testing-arm"
+    image: "$CLICKHOUSE_IMAGE"
     ulimits:
       nofile:
         soft: 262144
diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh
index 61484d35efe..9b7b57c568c 100644
--- a/install/check-minimum-requirements.sh
+++ b/install/check-minimum-requirements.sh
@@ -36,15 +36,4 @@ elif [[ "$RAM_AVAILABLE_IN_DOCKER" -lt "$MIN_RAM_SOFT" ]]; then
   echo "WARN: Recommended minimum RAM available to Docker is $MIN_RAM_SOFT MB, found $RAM_AVAILABLE_IN_DOCKER MB"
 fi
 
-#SSE4.2 required by Clickhouse (https://clickhouse.yandex/docs/en/operations/requirements/)
-# On KVM, cpuinfo could falsely not report SSE 4.2 support, so skip the check. https://github.com/ClickHouse/ClickHouse/issues/20#issuecomment-226849297
-IS_KVM=$(docker run --rm busybox grep -c 'Common KVM processor' /proc/cpuinfo || :)
-if [[ "$IS_KVM" -eq 0 ]]; then
-  SUPPORTS_SSE42=$(docker run --rm busybox grep -c sse4_2 /proc/cpuinfo || :)
-  if [[ "$SUPPORTS_SSE42" -eq 0 ]]; then
-    echo "FAIL: The CPU your machine is running on does not support the SSE 4.2 instruction set, which is required for one of the services Sentry uses (Clickhouse). See https://github.com/getsentry/self-hosted/issues/340 for more info."
-    exit 1
-  fi
-fi
-
 echo "${_endgroup}"

From d8791f270611cbb0e2512a5ae0841d1cea4aa1a0 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Tue, 28 Jun 2022 17:09:56 -0700
Subject: [PATCH 05/14] Configure docker platform when building

This works around the issue https://github.com/docker/cli/issues/3286, namely that containers are not built for linux/arm64 on Apple silicon Macs.

To solve this we add a PLATFORM variable which is used for building local containers.
---
 .env               | 8 ++++++++
 docker-compose.yml | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/.env b/.env
index 548e137d5ca..cedad374b68 100644
--- a/.env
+++ b/.env
@@ -21,6 +21,14 @@ CLICKHOUSE_IMAGE=yandex/clickhouse-server:20.3.9.70
 #CLICKHOUSE_IMAGE=altinity/clickhouse-server:20.10.1.4844-testing-arm
 # tl;dr ^^^ Uncomment this on ARM.
 
+# Images built on arm need to be tagged to use linux/arm64 on Apple silicon Macs.
+# To work around this issue we configure the platform here
+
+# See https://github.com/docker/cli/issues/3286 for the docker bug.
+DOCKER_PLATFORM=linux/amd64
+#DOCKER_PLATFORM=linux/arm64
+# tl;dr ^^^ Uncomment this on ARM.
+
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s
diff --git a/docker-compose.yml b/docker-compose.yml
index e9966fb1e7a..8ce977bdac9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ x-healthcheck-defaults: &healthcheck_defaults
 x-sentry-defaults: &sentry_defaults
   <<: *restart_policy
   image: sentry-self-hosted-local
+  # Set the platform to build for linux/arm64 when needed on Apple silicon Macs.
+  platform: ${DOCKER_PLATFORM}
   build:
     context: ./sentry
     args:

From 92c4e961d80fb68d49884d5de04db0e40eb968e9 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Tue, 28 Jun 2022 17:12:38 -0700
Subject: [PATCH 06/14] Fix including memory limit on ARM Clickhouse image

---
 clickhouse/config.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/clickhouse/config.xml b/clickhouse/config.xml
index 55cdbbd82b8..58ab86258ca 100644
--- a/clickhouse/config.xml
+++ b/clickhouse/config.xml
@@ -1,5 +1,10 @@
 <yandex>
-    <max_server_memory_usage_to_ram_ratio from_env="MAX_MEMORY_USAGE_RATIO" />
+    <max_server_memory_usage_to_ram_ratio>
+        <!-- This include is important!
+         It is required for the version of Clickhouse
+         used on ARM to read the environment variable. -->
+        <include from_env="MAX_MEMORY_USAGE_RATIO"/>
+    </max_server_memory_usage_to_ram_ratio>
     <logger>
         <level>information</level>
         <console>1</console>

From 8ef61db0a439c13c9bafdb30539174acb973da87 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Thu, 30 Jun 2022 12:13:30 -0700
Subject: [PATCH 07/14] ref: Automatically detect and configure docker
 platform/clickhouse

---
 .env                       | 19 -------------------
 install.sh                 |  1 +
 install/detect-platform.sh | 25 +++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100755 install/detect-platform.sh

diff --git a/.env b/.env
index cedad374b68..af9554210ff 100644
--- a/.env
+++ b/.env
@@ -10,25 +10,6 @@ SNUBA_IMAGE=getsentry/snuba:nightly
 RELAY_IMAGE=getsentry/relay:nightly
 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
 
-# Sentry SaaS uses stock Yandex ClickHouse, but they don't provide images that
-# support ARM, which is relevant especially for Apple M1 laptops, Sentry's
-# standard developer environment. As a workaround, you can manually toggle the
-# following to get an ARM build from an alternative-but-reputable vendor.
-
-# See https://github.com/getsentry/self-hosted/issues/1385#issuecomment-1101824274
-
-CLICKHOUSE_IMAGE=yandex/clickhouse-server:20.3.9.70
-#CLICKHOUSE_IMAGE=altinity/clickhouse-server:20.10.1.4844-testing-arm
-# tl;dr ^^^ Uncomment this on ARM.
-
-# Images built on arm need to be tagged to use linux/arm64 on Apple silicon Macs.
-# To work around this issue we configure the platform here
-
-# See https://github.com/docker/cli/issues/3286 for the docker bug.
-DOCKER_PLATFORM=linux/amd64
-#DOCKER_PLATFORM=linux/arm64
-# tl;dr ^^^ Uncomment this on ARM.
-
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s
diff --git a/install.sh b/install.sh
index 8b4f063c064..efee0cdf32e 100755
--- a/install.sh
+++ b/install.sh
@@ -11,6 +11,7 @@ source "$(dirname $0)/install/_lib.sh"  # does a `cd .../install/`, among other
 
 # Pre-flight. No impact yet.
 source parse-cli.sh
+source detect-platform.sh
 source dc-detect-version.sh
 source error-handling.sh
 source check-latest-commit.sh
diff --git a/install/detect-platform.sh b/install/detect-platform.sh
new file mode 100755
index 00000000000..32b686046bb
--- /dev/null
+++ b/install/detect-platform.sh
@@ -0,0 +1,25 @@
+echo "${_group}Detecting Docker platform"
+
+
+# Sentry SaaS uses stock Yandex ClickHouse, but they don't provide images that
+# support ARM, which is relevant especially for Apple M1 laptops, Sentry's
+# standard developer environment. As a workaround, we use an altinity image
+# targeting ARM.
+#
+# See https://github.com/getsentry/self-hosted/issues/1385#issuecomment-1101824274
+#
+# Images built on ARM also need to be tagged to use linux/arm64 on Apple
+# silicon Macs to work around an issue where they are built for
+# linux/amd64 by default due to virtualization.
+# See https://github.com/docker/cli/issues/3286 for the Docker bug.
+
+if [[ "$(docker info --format '{{.Architecture}}')" = "x86_64" ]]; then
+    DOCKER_PLATFORM="linux/amd64"
+    CLICKHOUSE_IMAGE="yandex/clickhouse-server:20.3.9.70"
+else
+    DOCKER_PLATFORM="linux/arm64"
+    CLICKHOUSE_IMAGE="altinity/clickhouse-server:20.10.1.4844-testing-arm"
+fi
+echo "Detected Docker platform is $DOCKER_PLATFORM"
+
+echo "${_endgroup}"

From 10c5755e53bf5a43fab7471368e50a6c9112cf93 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Thu, 30 Jun 2022 17:25:27 -0700
Subject: [PATCH 08/14] Use export, oops

---
 install/detect-platform.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/detect-platform.sh b/install/detect-platform.sh
index 32b686046bb..deb683a743b 100755
--- a/install/detect-platform.sh
+++ b/install/detect-platform.sh
@@ -14,11 +14,11 @@ echo "${_group}Detecting Docker platform"
 # See https://github.com/docker/cli/issues/3286 for the Docker bug.
 
 if [[ "$(docker info --format '{{.Architecture}}')" = "x86_64" ]]; then
-    DOCKER_PLATFORM="linux/amd64"
-    CLICKHOUSE_IMAGE="yandex/clickhouse-server:20.3.9.70"
+    export DOCKER_PLATFORM="linux/amd64"
+    export CLICKHOUSE_IMAGE="yandex/clickhouse-server:20.3.9.70"
 else
-    DOCKER_PLATFORM="linux/arm64"
-    CLICKHOUSE_IMAGE="altinity/clickhouse-server:20.10.1.4844-testing-arm"
+    export DOCKER_PLATFORM="linux/arm64"
+    export CLICKHOUSE_IMAGE="altinity/clickhouse-server:20.10.1.4844-testing-arm"
 fi
 echo "Detected Docker platform is $DOCKER_PLATFORM"
 

From 409485cfed7af89e19f4e84b8f219c3e1936dae1 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Tue, 5 Jul 2022 09:24:53 -0700
Subject: [PATCH 09/14] Make platform check more robust

---
 install/check-minimum-requirements.sh | 6 ++++++
 install/detect-platform.sh            | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh
index 9b7b57c568c..82e685b9db8 100644
--- a/install/check-minimum-requirements.sh
+++ b/install/check-minimum-requirements.sh
@@ -6,6 +6,12 @@ source "$(dirname $0)/_min-requirements.sh"
 function ver () { echo "$@" | awk -F. '{ printf("%d%03d%03d", $1,$2,$3); }'; }
 
 DOCKER_VERSION=$(docker version --format '{{.Server.Version}}')
+
+if [[ -z "$DOCKER_VERSION" ]]; then
+  echo "FAIL: Unable to get docker version, is the docker daemon running?"
+  exit 1
+fi
+
 if [[ "$(ver $DOCKER_VERSION)" -lt "$(ver $MIN_DOCKER_VERSION)" ]]; then
   echo "FAIL: Expected minimum docker version to be $MIN_DOCKER_VERSION but found $DOCKER_VERSION"
   exit 1
diff --git a/install/detect-platform.sh b/install/detect-platform.sh
index deb683a743b..ec0c9e256c1 100755
--- a/install/detect-platform.sh
+++ b/install/detect-platform.sh
@@ -13,12 +13,17 @@ echo "${_group}Detecting Docker platform"
 # linux/amd64 by default due to virtualization.
 # See https://github.com/docker/cli/issues/3286 for the Docker bug.
 
-if [[ "$(docker info --format '{{.Architecture}}')" = "x86_64" ]]; then
+DOCKER_ARCH=$(docker info --format '{{.Architecture}}')
+
+if [[ "$DOCKER_ARCH" = "x86_64" ]]; then
     export DOCKER_PLATFORM="linux/amd64"
     export CLICKHOUSE_IMAGE="yandex/clickhouse-server:20.3.9.70"
-else
+elif [[ "$DOCKER_ARCH" = "aarch64" ]]; then
     export DOCKER_PLATFORM="linux/arm64"
     export CLICKHOUSE_IMAGE="altinity/clickhouse-server:20.10.1.4844-testing-arm"
+else
+    echo "FAIL: Unsupported docker architecture $DOCKER_ARCH."
+    exit 1
 fi
 echo "Detected Docker platform is $DOCKER_PLATFORM"
 

From e34503d27d3b921bb4612eaca4786a2223dd4cc5 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Tue, 5 Jul 2022 10:29:33 -0700
Subject: [PATCH 10/14] Fix docker-compose.yml to allow running without
 platform environment settings

This allows running e.g. docker-compose up -d after running ./install.sh without needing to source install/check-platform.sh
---
 clickhouse/Dockerfile | 2 ++
 docker-compose.yml    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 clickhouse/Dockerfile

diff --git a/clickhouse/Dockerfile b/clickhouse/Dockerfile
new file mode 100644
index 00000000000..33ef7da93cb
--- /dev/null
+++ b/clickhouse/Dockerfile
@@ -0,0 +1,2 @@
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ce977bdac9..9c580377b4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ x-sentry-defaults: &sentry_defaults
   <<: *restart_policy
   image: sentry-self-hosted-local
   # Set the platform to build for linux/arm64 when needed on Apple silicon Macs.
-  platform: ${DOCKER_PLATFORM}
+  platform: ${DOCKER_PLATFORM:-}
   build:
     context: ./sentry
     args:
@@ -192,7 +192,12 @@ services:
       test: ["CMD-SHELL", "nc -z localhost 9092"]
   clickhouse:
     <<: *restart_policy
-    image: "$CLICKHOUSE_IMAGE"
+    image: clickhouse-self-hosted-local
+    build:
+      context:
+        ./clickhouse
+      args:
+        BASE_IMAGE: "${CLICKHOUSE_IMAGE:-}"
     ulimits:
       nofile:
         soft: 262144

From 7453b2440ae958cbc9c3e7f36006218bbfe76de4 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Wed, 6 Jul 2022 15:35:10 -0700
Subject: [PATCH 11/14] Restore SSE4.2 check on x86_64

---
 install/check-minimum-requirements.sh | 11 +++++++++++
 install/detect-platform.sh            |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh
index 82e685b9db8..b88f36eb11b 100644
--- a/install/check-minimum-requirements.sh
+++ b/install/check-minimum-requirements.sh
@@ -42,4 +42,15 @@ elif [[ "$RAM_AVAILABLE_IN_DOCKER" -lt "$MIN_RAM_SOFT" ]]; then
   echo "WARN: Recommended minimum RAM available to Docker is $MIN_RAM_SOFT MB, found $RAM_AVAILABLE_IN_DOCKER MB"
 fi
 
+#SSE4.2 required by Clickhouse (https://clickhouse.yandex/docs/en/operations/requirements/)
+# On KVM, cpuinfo could falsely not report SSE 4.2 support, so skip the check. https://github.com/ClickHouse/ClickHouse/issues/20#issuecomment-226849297
+IS_KVM=$(docker run --rm busybox grep -c 'Common KVM processor' /proc/cpuinfo || :)
+if [[ "$IS_KVM" -eq 0 && "$DOCKER_ARCH" = "x86_64" ]]; then
+  SUPPORTS_SSE42=$(docker run --rm busybox grep -c sse4_2 /proc/cpuinfo || :)
+  if [[ "$SUPPORTS_SSE42" -eq 0 ]]; then
+    echo "FAIL: The CPU your machine is running on does not support the SSE 4.2 instruction set, which is required for one of the services Sentry uses (Clickhouse). See https://github.com/getsentry/self-hosted/issues/340 for more info."
+    exit 1
+  fi
+fi
+
 echo "${_endgroup}"
diff --git a/install/detect-platform.sh b/install/detect-platform.sh
index ec0c9e256c1..f1d180470d2 100755
--- a/install/detect-platform.sh
+++ b/install/detect-platform.sh
@@ -13,7 +13,7 @@ echo "${_group}Detecting Docker platform"
 # linux/amd64 by default due to virtualization.
 # See https://github.com/docker/cli/issues/3286 for the Docker bug.
 
-DOCKER_ARCH=$(docker info --format '{{.Architecture}}')
+export DOCKER_ARCH=$(docker info --format '{{.Architecture}}')
 
 if [[ "$DOCKER_ARCH" = "x86_64" ]]; then
     export DOCKER_PLATFORM="linux/amd64"

From 9f781afe9c0b0739d842cac708e8fa7f0a07815e Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Wed, 6 Jul 2022 15:35:29 -0700
Subject: [PATCH 12/14] Add newline to end of Dockerfile

---
 clickhouse/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clickhouse/Dockerfile b/clickhouse/Dockerfile
index 33ef7da93cb..4e841c04bbf 100644
--- a/clickhouse/Dockerfile
+++ b/clickhouse/Dockerfile
@@ -1,2 +1,2 @@
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
\ No newline at end of file
+FROM ${BASE_IMAGE}

From ce6e1940127a722ac6a70f421ec2dcf9f68de75d Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Wed, 6 Jul 2022 15:35:46 -0700
Subject: [PATCH 13/14] Remove spurrious newline

---
 .env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env b/.env
index af9554210ff..acb4ee80410 100644
--- a/.env
+++ b/.env
@@ -9,7 +9,6 @@ SENTRY_IMAGE=getsentry/sentry:nightly
 SNUBA_IMAGE=getsentry/snuba:nightly
 RELAY_IMAGE=getsentry/relay:nightly
 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
-
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s

From 7e9a52926601fdc8c7cbf35685d8b0c6ff09d052 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan.smith@sentry.io>
Date: Wed, 6 Jul 2022 15:36:38 -0700
Subject: [PATCH 14/14] Use same ARM image for clickhouse as the dev
 environment

---
 install/detect-platform.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/detect-platform.sh b/install/detect-platform.sh
index f1d180470d2..23ddd4a1cec 100755
--- a/install/detect-platform.sh
+++ b/install/detect-platform.sh
@@ -20,7 +20,7 @@ if [[ "$DOCKER_ARCH" = "x86_64" ]]; then
     export CLICKHOUSE_IMAGE="yandex/clickhouse-server:20.3.9.70"
 elif [[ "$DOCKER_ARCH" = "aarch64" ]]; then
     export DOCKER_PLATFORM="linux/arm64"
-    export CLICKHOUSE_IMAGE="altinity/clickhouse-server:20.10.1.4844-testing-arm"
+    export CLICKHOUSE_IMAGE="altinity/clickhouse-server:21.6.1.6734-testing-arm"
 else
     echo "FAIL: Unsupported docker architecture $DOCKER_ARCH."
     exit 1