From 7945b12de04336e39d4d44c57af8475b5e64eb57 Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Sat, 6 Jul 2024 10:17:50 -0500
Subject: [PATCH] ARG should go INSIDE the FROM

---
 Dockerfile.base | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.base b/Dockerfile.base
index 0dbf85a..dd202df 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,5 +1,5 @@
-ARG TARGETPLATFORM
 FROM tomcat:9.0.88-jdk17
+ARG TARGETPLATFORM
 
 ENV GUAC_VER=1.5.5 \
     GUACAMOLE_HOME=/app/guacamole \
@@ -17,8 +17,10 @@ RUN useradd postgres
 # Cleanup default tomcat stuff
 RUN rm -rf /usr/local/tomcat/webapps.dist
 
+RUN echo $TARGETPLATFORM
+
 # Apply the s6-overlay
-RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCHITECTURE=armhf; elif [ "$TARGETPLATFORM" = "linux/arm/v8" ]; then ARCHITECTURE=aarch64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=aarch64; else ARCHITECTURE=amd64; fi \
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then ARCHITECTURE=armhf; elif [ "$TARGETPLATFORM" = "linux/arm/v8" ]; then ARCHITECTURE=aarch64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=aarch64; fi \
     && curl -sS -L -O --output-dir /tmp/ --create-dirs "https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-${ARCHITECTURE}-installer" \
     && chmod +x /tmp/s6-overlay-${ARCHITECTURE}-installer && /tmp/s6-overlay-${ARCHITECTURE}-installer / \
     && rm -rf /tmp/s6-overlay-${ARCHITECTURE}-installer