From 0389746d1d4afab0b3ca46b606d6e75da26968bf Mon Sep 17 00:00:00 2001
From: mazano <addloe@gmail.com>
Date: Fri, 26 Jul 2024 17:22:54 +0200
Subject: [PATCH] update to build 2.23.6 (#684)

---
 .github/workflows/build-latest.yaml       | 4 ++--
 .github/workflows/deploy-image.yaml       | 9 ++++-----
 .gitignore                                | 1 +
 scenario_tests/libjpeg/docker-compose.yml | 1 -
 scripts/functions.sh                      | 8 ++++++++
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
index 0e5eca20..97d0b9b7 100644
--- a/.github/workflows/build-latest.yaml
+++ b/.github/workflows/build-latest.yaml
@@ -68,8 +68,8 @@ jobs:
           - image: 9.0.91-jdk11-temurin-focal
             javaHome: /opt/java/openjdk
         geoserverMinorVersion:
-          - minor: 25
-            patch: 2
+          - minor: 23
+            patch: 6
         stablePluginBaseURL:
           - https://sourceforge.net/projects/geoserver/files/GeoServer
     steps:
diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
index 08e32265..5918e0a3 100644
--- a/.github/workflows/deploy-image.yaml
+++ b/.github/workflows/deploy-image.yaml
@@ -28,8 +28,8 @@ jobs:
           - image: 9.0.91-jdk11-temurin-focal
             javaHome: /opt/java/openjdk
         geoserverMinorVersion:
-          - minor: 25
-            patch: 2
+          - minor: 23
+            patch: 6
         stablePluginBaseURL:
           # empty because it often changes, so it's better
           # to use the default one described in the Dockerfile
@@ -63,9 +63,8 @@ jobs:
           file: Dockerfile
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_REPO }}/geoserver
-#            ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}
-#            ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}--v${{ steps.current_date.outputs.formatted }}
+            ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}
+            ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}--v${{ steps.current_date.outputs.formatted }}
           build-args: |
             IMAGE_VERSION=${{ matrix.imageVersion.image }}
             JAVA_HOME=${{ matrix.imageVersion.javaHome }}
diff --git a/.gitignore b/.gitignore
index 7f4c8389..a01a1551 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ scenario_tests/disk-quota/tests/__pycache__*
 scenario_tests/gwc/tests/__pycache__*
 scenario_tests/login/tests/__pycache__*
 scenario_tests/stores/tests/__pycache__*
+scenario_tests/libjpeg/tests/__pycache__*
 .DS_Store
diff --git a/scenario_tests/libjpeg/docker-compose.yml b/scenario_tests/libjpeg/docker-compose.yml
index 72855e4f..b2d1ac1f 100644
--- a/scenario_tests/libjpeg/docker-compose.yml
+++ b/scenario_tests/libjpeg/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 
 volumes:
   geoserver-data-dir:
diff --git a/scripts/functions.sh b/scripts/functions.sh
index 19e8cf9f..e8a6f6e6 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -153,17 +153,24 @@ fi
 
 # A little logic that will fetch the geoserver war zip file if it is not available locally in the resources dir
 function package_geoserver() {
+  # Check if resource file exists otherwise use the default downloaded
   if [[  -f /tmp/resources/geoserver-${GS_VERSION}.zip ]];then
     unzip /tmp/resources/geoserver-"${GS_VERSION}".zip -d /tmp/geoserver && \
     unzip_geoserver
   elif [[  -f /tmp/resources/geoserver-${GS_VERSION}-bin.zip  ]];then
     unzip /tmp/resources/geoserver-"${GS_VERSION}".zip -d /tmp/geoserver && \
     unzip_geoserver
+  elif [[  -f /tmp/resources/geoserver.war  ]];then
+    mkdir -p /tmp/geoserver
+    cp /tmp/resources/geoserver.war /tmp/geoserver/geoserver.war
+    unzip_geoserver
   else
     if [[ -f ${REQUIRED_PLUGINS_DIR}/geoserver.zip ]]; then
       unzip ${REQUIRED_PLUGINS_DIR}/geoserver.zip -d /tmp/geoserver && \
       unzip_geoserver
     elif [[ -f ${REQUIRED_PLUGINS_DIR}/geoserver.war ]]; then
+      mkdir /tmp/geoserver
+      cp ${REQUIRED_PLUGINS_DIR}/geoserver.war /tmp/geoserver
       unzip_geoserver
     else
       echo "GeoServer bin/war file missing, exiting installation"
@@ -172,6 +179,7 @@ function package_geoserver() {
   fi
 }
 
+
 # Helper function to setup cluster config for the clustering plugin
 # https://docs.geoserver.org/stable/en/user/community/jms-cluster/index.html
 function cluster_config() {