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] 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