Use temurin-focual to retain libgdal-java

Author: danschmidt5189

Dockerfile

@@ -1,4 +1,4 @@
-FROM tomcat:9-jre17-temurin AS base
+FROM tomcat:9-jre17-temurin-focal AS base
 
 ARG GEOSERVER_VERSION="2.28.0"
 ENV GEOSERVER_VERSION=$GEOSERVER_VERSION
@@ -11,7 +11,7 @@ RUN apt update && \
     apt -y --no-install-recommends install \
         gdal-bin \
         libgdal-dev \
-        libgdal34t64 \
+        libgdal-java \
         libsqlite3-dev \
         sqlite3 \
         swig \
@@ -41,6 +41,10 @@ COPY --from=download-geoserver /usr/local/tomcat/webapps/geoserver /usr/local/to
 COPY --from=download-cas-plugin /tmp/cas-plugin/*.jar $GEOSERVER_LIB_DIR/
 COPY --from=download-gdal-plugin /tmp/gdal-plugin/*.jar $GEOSERVER_LIB_DIR/
 
+# Downgrade the gdal jar so it matches the gdal version installed on the system
+RUN rm -f $GEOSERVER_LIB_DIR/gdal-3.2.0.jar && \
+    cp /usr/share/java/gdal.jar $GEOSERVER_LIB_DIR/gdal-3.0.4.jar
+
 # Ensure libgdalalljni.so is in the load path. If this isn't found, GeoServer will log and warn
 # about that on startup.
 ENV LD_LIBRARY_PATH="/usr/lib/jni:$LD_LIBRARY_PATH"