fixes #486 (#493)

.env

@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=kartozageoserver
 
-IMAGE_VERSION=9.0.65-jdk11-openjdk-slim-buster
+IMAGE_VERSION=9.0.71-jdk11-temurin-focal
 GS_VERSION=2.22.0
 GEOSERVER_PORT=8600
 # Build Arguments

Dockerfile

@@ -1,5 +1,5 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
-ARG IMAGE_VERSION=9.0.65-jdk11-openjdk-slim-buster
+ARG IMAGE_VERSION=9.0.71-jdk11-temurin-focal
 ARG JAVA_HOME=/usr/local/openjdk-11
 FROM tomcat:$IMAGE_VERSION
 
@@ -18,18 +18,14 @@ RUN set -eux; \
         locales gnupg2 wget ca-certificates rpl pwgen software-properties-common  iputils-ping \
         apt-transport-https curl gettext fonts-cantarell lmodern ttf-aenigma \
         ttf-bitstream-vera ttf-sjfonts tv-fonts  libapr1-dev libssl-dev  \
-        wget zip unzip curl xsltproc certbot  cabextract gettext postgresql-client figlet gosu gdal-bin; \
-    # Install gdal3 - bullseye doesn't build libgdal-java anymore so we can't upgrade
-    curl https://deb.meteo.guru/velivole-keyring.asc |  apt-key add - \
-    && echo "deb https://deb.meteo.guru/debian buster main" > /etc/apt/sources.list.d/meteo.guru.list \
-    && apt-get update \
-    && apt-get -y --no-install-recommends install gdal-bin libgdal-java; \
-    dpkg-divert --local --rename --add /sbin/initctl \
-    && (echo "Yes, do as I say!" | apt-get remove --force-yes login) \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*; \
-    # verify that the binary works
-	gosu nobody true
+        wget zip unzip curl xsltproc certbot  cabextract gettext postgresql-client figlet gosu gdal-bin libgdal-java; \
+      dpkg-divert --local --rename --add /sbin/initctl \
+      && (echo "Yes, do as I say!" | apt-get remove --force-yes login) \
+      && apt-get clean \
+      && rm -rf /var/lib/apt/lists/*; \
+      # verify that the binary works
+	  gosu nobody true
+
 
 ENV \
     JAVA_HOME=${JAVA_HOME} \

scripts/setup.sh

@@ -111,14 +111,14 @@ if ls /tmp/resources/plugins/*.zip >/dev/null 2>&1; then
 fi
 
 # Download appropriate gdal-jar
-GDAL_VERSION=$(gdalinfo --version | head -n1 | cut -d" " -f2)
-if [[ ${GDAL_VERSION:0:3} == 3.2 ]];then
-  echo "gdal versions are the same"
-else
-  rm /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/gdal-*
-  validate_url https://repo1.maven.org/maven2/org/gdal/gdal/${GDAL_VERSION:0:3}.0/gdal-${GDAL_VERSION:0:3}.0.jar \
-  '-O "${GEOSERVER_HOME}"/webapps/geoserver/WEB-INF/lib/gdal-${GDAL_VERSION:0:3}.0.jar'
-fi
+#GDAL_VERSION=$(gdalinfo --version | head -n1 | cut -d" " -f2)
+#if [[ ${GDAL_VERSION:0:3} == 3.2 ]];then
+#  echo "gdal versions are the same"
+#else
+#  rm /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/gdal-*
+#  validate_url https://repo1.maven.org/maven2/org/gdal/gdal/${GDAL_VERSION:0:3}.0/gdal-${GDAL_VERSION:0:3}.0.jar \
+#  '-O "${GEOSERVER_HOME}"/webapps/geoserver/WEB-INF/lib/gdal-${GDAL_VERSION:0:3}.0.jar'
+#fi
 
 
 # Install Marlin render https://www.geocat.net/docs/geoserver-enterprise/2020.5/install/production/marlin.html