From a1cec7cc07adc71eaf63f32aaad8d95936abd5e1 Mon Sep 17 00:00:00 2001
From: Jody Garnett <jody.garnett@gmail.com>
Date: Wed, 7 Jun 2023 20:49:29 -0700
Subject: [PATCH] Use jenkins build number to trigger a new download for
 re-release or nightly build

This is required as --no-cache-filter is not supported by the version of docker used on the build server
---
 Dockerfile       |  7 ++++---
 RELEASE.md       | 12 +++++++-----
 build/release.sh | 16 +++++++++-------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b17ee63..114eb4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,7 +60,7 @@ EOF
 FROM tomcat as download
 
 ARG GS_VERSION=2.23.1
-ARG GS_BUILD=''
+ARG GS_BUILD=release
 ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip
 ENV GEOSERVER_VERSION=$GS_VERSION
 ENV GEOSERVER_BUILD=$GS_BUILD
@@ -69,7 +69,7 @@ WORKDIR /tmp
 
 RUN <<EOF
 set -e
-echo "Downloading GeoServer ${GEOSERVER_VERSION} ${GEOSERVER_BUILD}"
+echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}"
 wget -q -O /tmp/geoserver.zip $WAR_ZIP_URL
 unzip geoserver.zip geoserver.war -d /tmp/
 unzip -q /tmp/geoserver.war -d /tmp/geoserver
@@ -79,7 +79,7 @@ EOF
 FROM tomcat as install
 
 ARG GS_VERSION=2.23.1
-ARG GS_BUILD=''
+ARG GS_BUILD=release
 ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions
 ARG COMMUNITY_PLUGIN_URL=''
 
@@ -105,6 +105,7 @@ ENV ROOT_WEBAPP_REDIRECT=false
 
 WORKDIR /tmp
 
+RUN echo "Installing GeoServer $GS_VERSION $GS_BUILD"
 # install geoserver
 COPY --from=download /tmp/geoserver $CATALINA_HOME/webapps/geoserver
 
diff --git a/RELEASE.md b/RELEASE.md
index e665d1f..4d95548 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -28,14 +28,16 @@ For CI purposes, the script in the `build` folder is used to simplify those step
 
 The variables `DOCKERUSER` and `DOCKERPASSWORD` have to be set with valid credentials before this script can push the image to the osgeo repo.
 
-You need to pass the version as first and the type as second argument, where type has to be one of `build`, `publish` or `buildandpublish`.
+You need to pass the action as the first argument (one of `build`, `publish` or `buildandpublish`), and the version as a second argument.
+
+The third, optional, is used to supply the jenkins build number - triggering a new war download. This is used when a release is re-published (such as with a nightly build).
 
 Examples:
 
-`./release.sh 2.22.1 build`
+`./release.sh build 2.22.1`
 
-`./release.sh 2.23.1 publish`
+`./release.sh publish 2.23.1`
 
-`./release.sh 2.22.1 buildandpublish`
+`./release.sh buildandpublish 2.22.1`
 
-`./release.sh 2.24-SNAPSHOT buildandpublish`
+`./release.sh buildandpublish 2.24-SNAPSHOT 1234`
diff --git a/build/release.sh b/build/release.sh
index bbb3fd9..8566411 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -19,10 +19,11 @@ if [ -z $1 ] || [ -z $2 ] || [[ $1 != "build" && $1 != "publish" && $1 != "build
 fi
 
 VERSION=$2
+echo "build: $3"
 if [ -z $3 ]; then
-  BUILD=$3
+  BUILD='local'
 else
-  BUILD=''
+  BUILD=$3
 fi
 
 if [[ "${VERSION:0:4}" == "$MAIN" ]]; then
@@ -51,8 +52,9 @@ if [[ $1 == *build* ]]; then
     echo "  nightly build from https://build.geoserver.org/geoserver/$BRANCH"
     echo
     if [[ "$BRANCH" == "main" ]]; then
-      echo "docker build --build-arg GS_VERSION=$VERSION -t $TAG ."
-      docker build --no-cache-filter download,install \
+      echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
+      # 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/ \
@@ -60,8 +62,8 @@ if [[ $1 == *build* ]]; then
         --build-arg GS_BUILD=$BUILD \
         -t $TAG .
     else
-      echo "docker build --build-arg GS_VERSION=$VERSION -t $TAG ."
-      docker build --no-cache-filter download,install \
+      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/ \
@@ -70,7 +72,7 @@ if [[ $1 == *build* ]]; then
         -t $TAG .
     fi
   else
-    echo "docker build --build-arg GS_VERSION=$VERSION -t $TAG ."
+    echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
     docker build \
       --build-arg GS_VERSION=$VERSION \
       --build-arg GS_BUILD=$BUILD \