From 4137b23869571a5e7d39e3fddae2e032433dc373 Mon Sep 17 00:00:00 2001
From: Jody Garnett <jody.garnett@gmail.com>
Date: Tue, 24 Sep 2024 12:02:22 -0700
Subject: [PATCH] we were unable to get build server happy with containerd
 multi platform support

---
 build/release.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/build/release.sh b/build/release.sh
index 6c83af5..c449bd7 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -49,8 +49,8 @@ else
   fi
 fi
 
-# Prerequisite for Multi-Arch via QEMU:
-docker run --privileged --rm tonistiigi/binfmt --install all
+# Prerequisite for Multi-Arch via QEM
+# docker run --privileged --rm tonistiigi/binfmt --install all
 
 echo "Release from branch $BRANCH GeoServer $VERSION as $TAG"
 
@@ -63,10 +63,9 @@ if [[ $1 == *build* ]]; then
     echo "  nightly build from https://build.geoserver.org/geoserver/$BRANCH"
     echo
     if [[ "$BRANCH" == "main" ]]; then
-      echo "docker build --platform linux/amd64,linux/arm64 --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
+      echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
       # todo: --no-cache-filter download,install
       docker build \
-        --platform linux/amd64,linux/arm64 \
         --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip \
         --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/main/ext-latest \
         --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/main/community-latest \
@@ -74,9 +73,8 @@ if [[ $1 == *build* ]]; then
         --build-arg GS_BUILD=$BUILD \
         -t $TAG .
     else
-      echo "docker build --platform linux/amd64,linux/arm64 --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
+      echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
       docker build \
-        --platform linux/amd64,linux/arm64 \
         --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/$BRANCH/geoserver-$BRANCH-latest-war.zip \
         --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/ext-latest \
         --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/community-latest \
@@ -85,9 +83,8 @@ if [[ $1 == *build* ]]; then
         -t $TAG .
     fi
   else
-    echo "docker build --platform linux/amd64,linux/arm64 --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
+    echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
     docker build \
-      --platform linux/amd64,linux/arm64 \
       --build-arg GS_VERSION=$VERSION \
       --build-arg GS_BUILD=$BUILD \
       -t $TAG .