From e0ea86ec9dd69cd2c4b3f22a84babf82375e6369 Mon Sep 17 00:00:00 2001 From: Tim Ebben Date: Tue, 25 Jun 2024 11:21:09 +0200 Subject: [PATCH] Upgraded GeoServer from version 2.25.1 to 2.25.2 (#668) * Upgraded GeoServer from version 2.25.1 to 2.25.2 --- .env | 2 +- .github/workflows/build-latest.yaml | 2 +- .github/workflows/deploy-image.yaml | 2 +- Dockerfile | 4 ++-- README.md | 26 +++++++++++++------------- build_data/community_plugins.txt | 8 ++++++-- build_data/stable_plugins.txt | 1 + clustering/docker-compose.yml | 4 ++-- 8 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.env b/.env index 3e992004..b6d18f49 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ COMPOSE_PROJECT_NAME=kartozageoserver # Build Arguments # ############### IMAGE_VERSION=9.0.89-jdk11-temurin-focal -GS_VERSION=2.25.1 +GS_VERSION=2.25.2 JAVA_HOME=/opt/java/openjdk WAR_URL=http://downloads.sourceforge.net/project/geoserver/GeoServer/2.25.0/geoserver-2.25.0-war.zip STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml index 5d777bd6..1090ef3c 100644 --- a/.github/workflows/build-latest.yaml +++ b/.github/workflows/build-latest.yaml @@ -63,7 +63,7 @@ jobs: javaHome: /opt/java/openjdk geoserverMinorVersion: - minor: 25 - patch: 1 + patch: 2 stablePluginBaseURL: - https://sourceforge.net/projects/geoserver/files/GeoServer steps: diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index 4c08cecc..39525f24 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -26,7 +26,7 @@ jobs: javaHome: /opt/java/openjdk geoserverMinorVersion: - minor: 25 - patch: 1 + patch: 2 #- minor: 23 #patch: 2 stablePluginBaseURL: diff --git a/Dockerfile b/Dockerfile index 27626787..4c676cdb 100755 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ARG JAVA_HOME=/opt/java/openjdk # Use $BUILDPLATFORM because plugin archives are architecture-neutral, and use # alpine because it's smaller. FROM --platform=$BUILDPLATFORM alpine:3.19 AS geoserver-plugin-downloader -ARG GS_VERSION=2.25.1 +ARG GS_VERSION=2.25.2 ARG STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer ARG WAR_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip @@ -45,7 +45,7 @@ RUN /work/plugin_download.sh FROM tomcat:$IMAGE_VERSION AS geoserver-prod LABEL maintainer="Tim Sutton" -ARG GS_VERSION=2.25.1 +ARG GS_VERSION=2.25.2 ARG STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer ARG HTTPS_PORT=8443 ENV DEBIAN_FRONTEND=noninteractive diff --git a/README.md b/README.md index a7faa947..3f955b60 100755 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The preferred way (but using the most bandwidth for the initial image) is to get our docker-trusted build like this: ```shell -VERSION=2.25.1 +VERSION=2.25.2 docker pull kartoza/geoserver:$VERSION ``` **Note** Although the images are tagged and backed by unit tests @@ -100,14 +100,14 @@ See the [dockerhub tomcat](https://hub.docker.com/_/tomcat/) for available tags. ``` -VERSION=2.25.1 +VERSION=2.25.2 IMAGE_VERSION=9.0.89-jdk11-temurin-focal docker build --build-arg IMAGE_VERSION=${IMAGE_VERSION} --build-arg GS_VERSION=${VERSION} -t kartoza/geoserver:${VERSION} . ``` For some recent builds, it is necessary to set the JAVA_PATH as well (e.g. Apache Tomcat/9.0.36) ``` -docker build --build-arg IMAGE_VERSION=9.0.89-jdk11-temurin-focal --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.25.1 -t kartoza/geoserver:2.25.1 . +docker build --build-arg IMAGE_VERSION=9.0.89-jdk11-temurin-focal --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.25.2 -t kartoza/geoserver:2.25.2 . ``` **Note:** Please check the [GeoServer documentation](https://docs.geoserver.org/stable/en/user/production/index.html) @@ -200,13 +200,13 @@ The environment variable `STABLE_EXTENSIONS` is used to activate extensions list Example ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -d -p 8600:8080 --name geoserver -e STABLE_EXTENSIONS=charts-plugin,db2-plugin kartoza/geoserver:${VERSION} ``` You can pass any comma-separated extensions as defined in [stable_plugins.txt](https://github.com/kartoza/docker-geoserver/blob/master/build_data/stable_plugins.txt) -**Note** If an extension is defined in [GeoServer list](https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.1/extensions/) +**Note** If an extension is defined in [GeoServer list](https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.2/extensions/) but is missing from [stable_plugins.txt](https://github.com/kartoza/docker-geoserver/blob/master/build_data/stable_plugins.txt) you can still pass the env variable referencing that image, and it will be downloaded and activated during container initialisation. @@ -218,7 +218,7 @@ The environment variable `COMMUNITY_EXTENSIONS` can be used to activate extensio Example ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -d -p 8600:8080 --name geoserver -e COMMUNITY_EXTENSIONS=gwc-sqlite-plugin,ogr-datastore-plugin kartoza/geoserver:${VERSION} ``` @@ -235,7 +235,7 @@ Geoserver ships with sample data which can be used by users to familiarize them This is not activated by default. You can activate it using the environment variable `boolean SAMPLE_DATA`. ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -d -p 8600:8080 --name geoserver -e SAMPLE_DATA=true kartoza/geoserver:${VERSION} ``` @@ -307,14 +307,14 @@ If you set the environment variable `SSL=true` but do not provide the pem files the container will generate self-signed SSL certificates. ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -it --name geoserver -e PKCS12_PASSWORD=geoserver -e JKS_KEY_PASSWORD=geoserver -e JKS_STORE_PASSWORD=geoserver -e SSL=true -p 8443:8443 -p 8600:8080 kartoza/geoserver:${VERSION} ``` If you already have your perm files (`fullchain.pem` and `privkey.pem`) you can mount the directory containing your keys as: ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -it --name geo -v /etc/certs:/etc/certs -e PKCS12_PASSWORD=geoserver -e JKS_KEY_PASSWORD=geoserver -e JKS_STORE_PASSWORD=geoserver -e SSL=true -p 8443:8443 -p 8600:8080 kartoza/geoserver:${VERSION} ``` @@ -370,7 +370,7 @@ To include Tomcat extras including docs, examples, and the manager web app, set to use a strong password otherwise a randomly generated password is used. ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -it --name geoserver -e TOMCAT_EXTRAS=true -p 8600:8080 kartoza/geoserver:${VERSION} ``` @@ -394,7 +394,7 @@ If you have downloaded extra fonts you can mount the folder to the path path during initialisation. This is useful for styling layers i.e. labeling using specific fonts. ``` -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -v fonts:/opt/fonts -p 8080:8080 -t kartoza/geoserver:${VERSION} ``` @@ -404,7 +404,7 @@ You can use the environment variable `GOOGLE_FONTS_NAMES` to activate fonts defi i.e. ```bash -ie VERSION=2.25.1 +ie VERSION=2.25.2 docker run -e GOOGLE_FONTS_NAMES=actor,akronim -p 8080:8080 -t kartoza/geoserver:${VERSION} ``` @@ -650,7 +650,7 @@ For community extensions run the command below: For stable extensions run the command below: ```bash cd ./build_data -python3 stable_plugins.py 2.25.1 https://sourceforge.net/projects/geoserver/files/GeoServer +python3 stable_plugins.py 2.25.2 https://sourceforge.net/projects/geoserver/files/GeoServer ``` diff --git a/build_data/community_plugins.txt b/build_data/community_plugins.txt index a07c1a22..5b5daeae 100644 --- a/build_data/community_plugins.txt +++ b/build_data/community_plugins.txt @@ -1,6 +1,9 @@ activeMQ-broker-plugin backup-restore-plugin -cog-plugin +cog-azure-plugin +cog-google-plugin +cog-http-plugin +cog-s3-plugin colormap-plugin cov-json-plugin datadir-catalog-loader-plugin @@ -27,6 +30,7 @@ jdbc-metrics-plugin jdbcconfig-plugin jdbcstore-plugin jms-cluster-plugin +jwt-headers-plugin libdeflate-plugin mbtiles-plugin mbtiles-store-plugin @@ -65,4 +69,4 @@ webp-plugin wfs-freemarker-plugin wps-longitudinal-profile-plugin wps-remote-plugin -xslt-plugin \ No newline at end of file +xslt-plugin diff --git a/build_data/stable_plugins.txt b/build_data/stable_plugins.txt index f0873ea1..3d4370cd 100644 --- a/build_data/stable_plugins.txt +++ b/build_data/stable_plugins.txt @@ -30,6 +30,7 @@ oracle-plugin params-extractor-plugin printing-plugin querylayer-plugin +rat-plugin sldservice-plugin sqlserver-plugin wcs2_0-eo-plugin diff --git a/clustering/docker-compose.yml b/clustering/docker-compose.yml index 4d74d616..f25a573b 100644 --- a/clustering/docker-compose.yml +++ b/clustering/docker-compose.yml @@ -20,7 +20,7 @@ services: healthcheck: test: "PGPASSWORD=docker pg_isready -h 127.0.0.1 -U docker -d gis" master: - image: kartoza/geoserver:2.25.1 + image: kartoza/geoserver:2.25.2 volumes: - geoserver-cluster-data:/opt/geoserver/data_dir - geoserver-cluster-gwc-data:/opt/geoserver/gwc @@ -55,7 +55,7 @@ services: timeout: 10s retries: 3 node: - image: kartoza/geoserver:2.25.1 + image: kartoza/geoserver:2.25.2 volumes: - geoserver-cluster-data:/opt/geoserver/data_dir - geoserver-cluster-gwc-data:/opt/geoserver/gwc