From a3f338ce8a5aaf09912cc0f35dd80ec858acf25f Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Mon, 14 Oct 2024 15:39:34 +0100
Subject: [PATCH 1/8] Generate GEOSERVER IMAGE 2.25.2 for groundmapper

---
 .github/workflows/main.yml | 7 ++++---
 build/Dockerfile           | 8 ++++----
 build/build.bat            | 4 ++--
 build/build.sh             | 8 ++++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 813fca8..816384b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - "master"
+      - "OPT-671-apply-patches-to-geoserver"
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
@@ -10,9 +11,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.26.0-jms # 2.22.1
-            gs-version: 2.26.0
-            label: 2.26.0-jms
+          - tag: 2.25.2-arm64
+            gs-version: 2.25.2
+            label: 2.25.2
     permissions:
       contents: read
       packages: write
diff --git a/build/Dockerfile b/build/Dockerfile
index a96f1c5..5d52d3f 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,8 +1,8 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Defaults to amd64:
-FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
+# FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
 # Valid for arm64:
-# FROM tomcat:9-jre11-temurin@sha256:96f05b79814a1fb0523e3063668b4e3be7a1bbb01e6e6b2757915764381825ac
+FROM tomcat:9-jre11-temurin@sha256:87d94e757ccd243c9f277ae6fd362bd1c718446599fb36acd8f93c1af3efaf61
 #9.0-jre11-slim
 #9.0.65-jdk11-openjdk-slim
 MAINTAINER thinkWhere<info@thinkwhere.com>
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index 69f16fb..c88ba50 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -1,6 +1,6 @@
 @Echo off
 
-SET GS_VERSION=2.18.3
+SET GS_VERSION=2.25.2
 SET BUILD_GS_VERSION=%GS_VERSION:~0,4%
 
 rem Create plugins folder if does not exist
@@ -17,7 +17,7 @@ for %%f in (%plugins%) do (
 	@ECHO geoserver-%%f-plugin downloaded.
 )
 
-SET community_plugins=cog
+SET community_plugins=cog-s3
 
 rem Community plugins are not available from sourgeforge
 rem therefore source from https://build.geoserver.org/
diff --git a/build/build.sh b/build/build.sh
index 41db27d..951cefd 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -11,7 +11,7 @@ then
     mkdir ./resources/plugins
 fi
 
-GS_VERSION=2.26.0
+GS_VERSION=2.25.2
 BUILD_GS_VERSION=${GS_VERSION:0:-2}
 
 # Add in selected plugins.  Comment out or modify as required
@@ -27,7 +27,7 @@ done
 
 # Community plugins are not available from sourgeforge
 # therefore source from https://build.geoserver.org/
-community_plugins=(cog-s3 jms-cluster) # activeMQ-broker )
+community_plugins=(cog-s3)
 for c in "${community_plugins[@]}"
 do
 	if [ ! -f resources/plugins/geoserver-${c}-plugin.zip ]
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=true -t thinkwhere/geoserver:${GS_VERSION} .
+# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=true -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file

From 58ad5d36f41de579f6c5b59389e595f6cf55a3a5 Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Tue, 15 Oct 2024 11:53:32 +0100
Subject: [PATCH 2/8] Change image name to have Gm

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 816384b..ea2dded 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.25.2-arm64
+          - tag: 2.25.2-arm64-GM
             gs-version: 2.25.2
             label: 2.25.2
     permissions:

From 253b8a834f1d64e0aa41f2e0b7dd5462de1e7056 Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Tue, 15 Oct 2024 13:18:50 +0100
Subject: [PATCH 3/8] Remove jms-cluster plug-in

---
 .github/workflows/main.yml | 2 +-
 build/download.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ea2dded..816384b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.25.2-arm64-GM
+          - tag: 2.25.2-arm64
             gs-version: 2.25.2
             label: 2.25.2
     permissions:
diff --git a/build/download.sh b/build/download.sh
index bb11611..fc85ba5 100644
--- a/build/download.sh
+++ b/build/download.sh
@@ -31,7 +31,7 @@ done
 
 # Community plugins are not available from sourgeforge
 # therefore source from https://build.geoserver.org/
-community_plugins=(cog-s3 jms-cluster) #activeMQ-broker )
+community_plugins=(cog-s3)
 for c in "${community_plugins[@]}"
 do
 	if [ ! -f resources/plugins/geoserver-${c}-plugin.zip ]

From 1d7b3fffb96d84ffb50d4743418ec76b8f1a9ae2 Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Thu, 17 Oct 2024 10:38:16 +0100
Subject: [PATCH 4/8] Generate GEOSERVER IMAGE 2.25.2 for groundmapper and
 AMD64 systems

---
 .github/workflows/main.yml | 4 ++--
 build/Dockerfile           | 8 ++++----
 build/build.bat            | 4 ++--
 build/build.sh             | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 816384b..075289b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.25.2-arm64
+          - tag: 2.25.2-amd64
             gs-version: 2.25.2
             label: 2.25.2
     permissions:
@@ -58,5 +58,5 @@ jobs:
             GS_VERSION=${{ matrix.gs-version }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/arm64/v8
+          platforms: linux/amd64 #linux/arm64/v8
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/build/Dockerfile b/build/Dockerfile
index 5d52d3f..d6fe5a7 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,8 +1,8 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Defaults to amd64:
-# FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
+FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
 # Valid for arm64:
-FROM tomcat:9-jre11-temurin@sha256:87d94e757ccd243c9f277ae6fd362bd1c718446599fb36acd8f93c1af3efaf61
+# FROM tomcat:9-jre11-temurin@sha256:87d94e757ccd243c9f277ae6fd362bd1c718446599fb36acd8f93c1af3efaf61
 #9.0-jre11-slim
 #9.0.65-jdk11-openjdk-slim
 MAINTAINER thinkWhere<info@thinkwhere.com>
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index c88ba50..3365ecb 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -34,6 +34,6 @@ rem    GDAL_NATIVE    [true | false]  - default false; build with GDAL support
 rem    GS_VERSION                     - specifies which version of geoserver is to be built
 
 rem Valid for AMD64 (i.e., t3a.medium)
-rem docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=true -t thinkwhere/geoserver:${GS_VERSION} .
+docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 rem Valid also for ARM64 (i.e., t4g.medium)
-docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
+rem docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
diff --git a/build/build.sh b/build/build.sh
index 951cefd..ca4e64b 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=true -t thinkwhere/geoserver:${GS_VERSION} .
+docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file

From 1a7bb5c4ae335a8a999ff3df6d799b21a43c1f2b Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Thu, 21 Nov 2024 14:38:43 +0000
Subject: [PATCH 5/8] Updating geoserver image for amr64

---
 build/Dockerfile | 8 ++++----
 build/build.bat  | 6 +++---
 build/build.sh   | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index d6fe5a7..0640a9d 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,8 +1,8 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Defaults to amd64:
-FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
+# FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
 # Valid for arm64:
-# FROM tomcat:9-jre11-temurin@sha256:87d94e757ccd243c9f277ae6fd362bd1c718446599fb36acd8f93c1af3efaf61
+FROM tomcat:9-jre11-temurin@sha256:7477976d90cf983f6efe920cad41c1773481ddf61f403f59cfc1db1979c4150b
 #9.0-jre11-slim
 #9.0.65-jdk11-openjdk-slim
 MAINTAINER thinkWhere<info@thinkwhere.com>
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index 3365ecb..9f63764 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -7,7 +7,7 @@ rem Create plugins folder if does not exist
 if not exist .\resources\NUL mkdir .\resources
 if not exist .\resources\plugins\NUL mkdir .\resources\plugins
 
-SET plugins=control-flow,inspire,monitor,css,ysld,web-resource,sldservice,gwc-s3
+SET plugins=control-flow,inspire,monitor,css,ysld,web-resource,sldservice
  
 rem Download plugins from list above.  Modify list as required
 rem works for windows 10 powershell
@@ -34,6 +34,6 @@ rem    GDAL_NATIVE    [true | false]  - default false; build with GDAL support
 rem    GS_VERSION                     - specifies which version of geoserver is to be built
 
 rem Valid for AMD64 (i.e., t3a.medium)
-docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+rem docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 rem Valid also for ARM64 (i.e., t4g.medium)
-rem docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
+docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
diff --git a/build/build.sh b/build/build.sh
index ca4e64b..958d9a2 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -15,7 +15,7 @@ GS_VERSION=2.25.2
 BUILD_GS_VERSION=${GS_VERSION:0:-2}
 
 # Add in selected plugins.  Comment out or modify as required
-plugins=(control-flow inspire monitor css ysld web-resource sldservice gwc-s3)
+plugins=(control-flow inspire monitor css ysld web-resource sldservice)
 
 for p in "${plugins[@]}"
 do 
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file

From 03c4e73733b1f42c3f9f178fd27f1c124495e483 Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Thu, 21 Nov 2024 15:00:26 +0000
Subject: [PATCH 6/8] Updating geoserver image for amd64

---
 .github/workflows/main.yml | 2 +-
 build/Dockerfile           | 8 ++++----
 build/build.bat            | 4 ++--
 build/build.sh             | 4 ++--
 build/download.sh          | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 075289b..dc5592a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,5 +58,5 @@ jobs:
             GS_VERSION=${{ matrix.gs-version }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/amd64 #linux/arm64/v8
+          platforms: linux/amd64 # linux/arm64/v8 # 
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/build/Dockerfile b/build/Dockerfile
index 0640a9d..37d7f78 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,8 +1,8 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Defaults to amd64:
-# FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
+FROM tomcat:9-jre11-temurin@sha256:ab47680f4dd6785e7f19fe7e9f2cd7fce0819c4a223ea98d8c39a38ea810bdde
 # Valid for arm64:
-FROM tomcat:9-jre11-temurin@sha256:7477976d90cf983f6efe920cad41c1773481ddf61f403f59cfc1db1979c4150b
+# FROM tomcat:9-jre11-temurin@sha256:7477976d90cf983f6efe920cad41c1773481ddf61f403f59cfc1db1979c4150b
 #9.0-jre11-slim
 #9.0.65-jdk11-openjdk-slim
 MAINTAINER thinkWhere<info@thinkwhere.com>
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index 9f63764..c4c93e7 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -34,6 +34,6 @@ rem    GDAL_NATIVE    [true | false]  - default false; build with GDAL support
 rem    GS_VERSION                     - specifies which version of geoserver is to be built
 
 rem Valid for AMD64 (i.e., t3a.medium)
-rem docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 rem Valid also for ARM64 (i.e., t4g.medium)
-docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
+rem docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
diff --git a/build/build.sh b/build/build.sh
index 958d9a2..89b9534 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
diff --git a/build/download.sh b/build/download.sh
index fc85ba5..b6e083d 100644
--- a/build/download.sh
+++ b/build/download.sh
@@ -18,7 +18,7 @@ then
 fi
 
 # Add in selected plugins.  Comment out or modify as required
-plugins=(control-flow inspire monitor css ysld web-resource sldservice gwc-s3)
+plugins=(control-flow inspire monitor css ysld web-resource sldservice)
 
 for p in "${plugins[@]}"
 do

From ad43b70a3d84e418d26144113914f67f2e33e745 Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Thu, 21 Nov 2024 15:11:02 +0000
Subject: [PATCH 7/8] Updating geoserver image for arm64

---
 .github/workflows/main.yml | 4 ++--
 build/Dockerfile           | 4 ++--
 build/build.bat            | 4 ++--
 build/build.sh             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dc5592a..502f908 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.25.2-amd64
+          - tag: 2.25.2-arm64
             gs-version: 2.25.2
             label: 2.25.2
     permissions:
@@ -58,5 +58,5 @@ jobs:
             GS_VERSION=${{ matrix.gs-version }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/amd64 # linux/arm64/v8 # 
+          platforms: linux/arm64/v8 # linux/amd64 
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/build/Dockerfile b/build/Dockerfile
index 37d7f78..ccd16ac 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index c4c93e7..9f63764 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -34,6 +34,6 @@ rem    GDAL_NATIVE    [true | false]  - default false; build with GDAL support
 rem    GS_VERSION                     - specifies which version of geoserver is to be built
 
 rem Valid for AMD64 (i.e., t3a.medium)
-docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+rem docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 rem Valid also for ARM64 (i.e., t4g.medium)
-rem docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
+docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
diff --git a/build/build.sh b/build/build.sh
index 89b9534..958d9a2 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file

From 46ce899d22b2931134d2f18fea294710bb2f4ce5 Mon Sep 17 00:00:00 2001
From: Jose Sanchez-Morales <jose.sanchez-morales@idoxgroup.com>
Date: Tue, 17 Dec 2024 11:41:02 +0000
Subject: [PATCH 8/8] Generating geoserver docker image for 2.25.2 and amd64
 systems

---
 .github/workflows/main.yml | 2 +-
 build/Dockerfile           | 6 +++---
 build/build.bat            | 7 +++----
 build/build.sh             | 6 +++---
 build/download.sh          | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 502f908..e38c7c1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.25.2-arm64
+          - tag: 2.25.2-amd64 # 2.25.2-arm64
             gs-version: 2.25.2
             label: 2.25.2
     permissions:
diff --git a/build/Dockerfile b/build/Dockerfile
index ccd16ac..f267d57 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,6 +1,6 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Defaults to amd64:
-FROM tomcat:9-jre11-temurin@sha256:ab47680f4dd6785e7f19fe7e9f2cd7fce0819c4a223ea98d8c39a38ea810bdde
+FROM tomcat:9-jre11-temurin@sha256:f4cc53f42b3f25689119a153ff4af60d7b71e5e1668e2e70c4c550d23a7f3344
 # Valid for arm64:
 # FROM tomcat:9-jre11-temurin@sha256:7477976d90cf983f6efe920cad41c1773481ddf61f403f59cfc1db1979c4150b
 #9.0-jre11-slim
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index 9f63764..506c42c 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -7,7 +7,7 @@ rem Create plugins folder if does not exist
 if not exist .\resources\NUL mkdir .\resources
 if not exist .\resources\plugins\NUL mkdir .\resources\plugins
 
-SET plugins=control-flow,inspire,monitor,css,ysld,web-resource,sldservice
+SET plugins=control-flow,inspire,monitor,css,ysld,web-resource,sldservice,gwc-s3
  
 rem Download plugins from list above.  Modify list as required
 rem works for windows 10 powershell
@@ -27,13 +27,12 @@ for %%f in (%community_plugins%) do (
 	@ECHO geoserver-%%f-plugin downloaded.
 )
 
-
 rem Build options include:
 rem    TOMCAT_EXTRAS  [true | false]
 rem    GDAL_NATIVE    [true | false]  - default false; build with GDAL support
 rem    GS_VERSION                     - specifies which version of geoserver is to be built
 
 rem Valid for AMD64 (i.e., t3a.medium)
-rem docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 rem Valid also for ARM64 (i.e., t4g.medium)
-docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
+rem docker buildx build --build-arg GS_VERSION=%GS_VERSION% --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:%GS_VERSION% --push .
diff --git a/build/build.sh b/build/build.sh
index 958d9a2..ca4e64b 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -15,7 +15,7 @@ GS_VERSION=2.25.2
 BUILD_GS_VERSION=${GS_VERSION:0:-2}
 
 # Add in selected plugins.  Comment out or modify as required
-plugins=(control-flow inspire monitor css ysld web-resource sldservice)
+plugins=(control-flow inspire monitor css ysld web-resource sldservice gwc-s3)
 
 for p in "${plugins[@]}"
 do 
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
+docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
diff --git a/build/download.sh b/build/download.sh
index b6e083d..fc85ba5 100644
--- a/build/download.sh
+++ b/build/download.sh
@@ -18,7 +18,7 @@ then
 fi
 
 # Add in selected plugins.  Comment out or modify as required
-plugins=(control-flow inspire monitor css ysld web-resource sldservice)
+plugins=(control-flow inspire monitor css ysld web-resource sldservice gwc-s3)
 
 for p in "${plugins[@]}"
 do