From d4656efdf3f9a786efae6c82d8ff4bd638ab5df8 Mon Sep 17 00:00:00 2001
From: Jody Garnett <jody.garnett@gmail.com>
Date: Mon, 23 Oct 2023 00:28:04 -0400
Subject: [PATCH] [GEOS-11169] Correct release.sh STABLE_PLUGIN_URL and
 COMMUNITY_PLUGIN_URL

---
 Dockerfile              |  2 +-
 build/release.sh        | 24 ++++++++++++------------
 docker-compose-demo.yml |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7984a29..8f180d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,7 +66,7 @@ RUN echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}" \
 
 FROM tomcat as install
 
-ARG GS_VERSION=2.23.1
+ARG GS_VERSION=2.24.0
 ARG GS_BUILD=release
 ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions
 ARG COMMUNITY_PLUGIN_URL=''
diff --git a/build/release.sh b/build/release.sh
index 5c25f92..732f626 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -27,9 +27,9 @@ else
 fi
 
 if [[ "$VERSION" == *"-RC"* ]]; then
-  	# release candidate branch release
-  	BRANCH="${VERSION:0:4}-RC"
-  	TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH
+    # release candidate branch release
+    BRANCH="${VERSION:0:4}-RC"
+    TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH
 else
   if [[ "${VERSION:0:4}" == "$MAIN" ]]; then
     # main branch snapshot release
@@ -37,12 +37,12 @@ else
     TAG=geoserver-docker.osgeo.org/geoserver:$MAIN.x
   else
     if [[ "$VERSION" == *"-SNAPSHOT"* ]]; then
-  	# stable or maintenance branch snapshot release
-  	BRANCH="${VERSION:0:4}.x"
-  	TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH
+    # stable or maintenance branch snapshot release
+    BRANCH="${VERSION:0:4}.x"
+    TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH
     else
-  	BRANCH="${VERSION:0:4}.x"
-  	TAG=geoserver-docker.osgeo.org/geoserver:$VERSION
+    BRANCH="${VERSION:0:4}.x"
+    TAG=geoserver-docker.osgeo.org/geoserver:$VERSION
     fi
   fi
 fi
@@ -62,8 +62,8 @@ if [[ $1 == *build* ]]; then
       # todo: --no-cache-filter download,install
       docker build \
         --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/ \
+        --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 \
         --build-arg GS_VERSION=$VERSION \
         --build-arg GS_BUILD=$BUILD \
         -t $TAG .
@@ -71,8 +71,8 @@ if [[ $1 == *build* ]]; then
       echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
       docker build \
         --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/ \
+        --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 \
         --build-arg GS_VERSION=$VERSION \
         --build-arg GS_BUILD=$BUILD \
         -t $TAG .
diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml
index faa6f32..bdb1bda 100644
--- a/docker-compose-demo.yml
+++ b/docker-compose-demo.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: .
       args:
-        - GEOSERVER_VERSION=2.22.0
+        - GEOSERVER_VERSION=2.24.0
         - CORS_ENABLED=true
         - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
     ports: