From bacfe87bdfda106ef36e161114a500213a5e73dd Mon Sep 17 00:00:00 2001
From: Chris Bellew <cjbellew@gmail.com>
Date: Sat, 1 Jun 2024 16:14:25 +0800
Subject: [PATCH] Update Dockerfile

---
 packaging/all-in-one/Dockerfile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/packaging/all-in-one/Dockerfile b/packaging/all-in-one/Dockerfile
index 12a30ad..48a5f9d 100644
--- a/packaging/all-in-one/Dockerfile
+++ b/packaging/all-in-one/Dockerfile
@@ -2,16 +2,6 @@ FROM cbellew/pg-ferret-slim:latest
 
 WORKDIR /app
 
-RUN ARCH=$(uname -m) && \
-  if [ "$ARCH" = "x86_64" ]; then \
-    TEMPO_ARCH="amd64"; \
-  elif [ "$ARCH" = "aarch64" ]; then \
-    TEMPO_ARCH="arm64"; \
-  else \
-    echo "Unsupported architecture: $ARCH"; exit 1; \
-  fi && \
-  curl -L -o tempo_2.0.0_linux_$TEMPO_ARCH.deb https://github.com/grafana/tempo/releases/download/v2.0.0/tempo_2.0.0_linux_$TEMPO_ARCH.deb
-
 # Install Tempo and Grafana
 RUN apt-get update \
   && apt-get install -y software-properties-common curl \
@@ -19,6 +9,15 @@ RUN apt-get update \
   && curl -s https://packages.grafana.com/gpg.key | apt-key add - \
   && apt-get update \
   && apt-get install -y grafana \
+  && ARCH=$(uname -m) && \
+  if [ "$ARCH" = "x86_64" ]; then \
+    TEMPO_ARCH="amd64"; \
+  elif [ "$ARCH" = "aarch64" ]; then \
+    TEMPO_ARCH="arm64"; \
+  else \
+    echo "Unsupported architecture: $ARCH"; exit 1; \
+  fi && \
+  curl -L -o tempo_2.0.0_linux_$TEMPO_ARCH.deb https://github.com/grafana/tempo/releases/download/v2.0.0/tempo_2.0.0_linux_$TEMPO_ARCH.deb \
   && dpkg -i tempo_2.0.0_linux_*.deb \
   && rm tempo_2.0.0_linux_*.deb \
   && apt-get install -y grafana \