From 5886f05569497346aff1740c856b56248aee6e3f Mon Sep 17 00:00:00 2001 From: mazano Date: Sat, 25 Feb 2023 08:16:51 +0200 Subject: [PATCH] Upgraded GeoServer from version 2.22.1 to 2.22.2 (#497) --- .env | 4 ++-- Dockerfile | 2 +- README.md | 24 ++++++++++++------------ clustering/docker-compose.yml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 5112fc12..fd5a62d0 100644 --- a/.env +++ b/.env @@ -1,11 +1,11 @@ COMPOSE_PROJECT_NAME=kartozageoserver IMAGE_VERSION=9.0.71-jdk11-temurin-focal -GS_VERSION=2.22.1 +GS_VERSION=2.22.2 GEOSERVER_PORT=8600 # Build Arguments JAVA_HOME=/usr/local/openjdk-11 -WAR_URL=http://downloads.sourceforge.net/project/geoserver/GeoServer/2.22.1/geoserver-2.22.1-war.zip +WAR_URL=http://downloads.sourceforge.net/project/geoserver/GeoServer/2.22.2/geoserver-2.22.2-war.zip STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer DOWNLOAD_ALL_STABLE_EXTENSIONS=1 DOWNLOAD_ALL_COMMUNITY_EXTENSIONS=1 diff --git a/Dockerfile b/Dockerfile index c9eba3da..3355bf15 100755 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG JAVA_HOME=/usr/local/openjdk-11 FROM tomcat:$IMAGE_VERSION LABEL maintainer="Tim Sutton" -ARG GS_VERSION=2.22.1 +ARG GS_VERSION=2.22.2 ARG WAR_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip ARG STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer ARG DOWNLOAD_ALL_STABLE_EXTENSIONS=1 diff --git a/README.md b/README.md index 939e62e1..ea1ac779 100755 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The preferred way (but using most bandwidth for the initial image) is to get our docker trusted build like this: ```shell -VERSION=2.22.1 +VERSION=2.22.2 docker pull kartoza/geoserver:$VERSION ``` ### Building the image @@ -98,13 +98,13 @@ To build using a specific tagged release for tomcat image set the to choose which tag you need to build against. ``` -ie VERSION=2.22.1 -docker build --build-arg IMAGE_VERSION=8-jre8 --build-arg GS_VERSION=2.22.1 -t kartoza/geoserver:${VERSION} . +ie VERSION=2.22.2 +docker build --build-arg IMAGE_VERSION=8-jre8 --build-arg GS_VERSION=2.22.2 -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-jdk11-openjdk-slim --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.22.1 -t kartoza/geoserver:2.22.1 . +docker build --build-arg IMAGE_VERSION=9-jdk11-openjdk-slim --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.22.2 -t kartoza/geoserver:2.22.2 . ``` **Note:** Please check the [GeoServer documentation](https://docs.geoserver.org/stable/en/user/production/index.html) @@ -171,7 +171,7 @@ The image ships with the following stable plugins: * csw-plugin **Note:** The plugins listed above are omitted from [Stable_plugins.txt](https://github.com/kartoza/docker-geoserver/blob/master/build_data/stable_plugins.txt) -even though they are considered [stable plugins](https://sourceforge.net/projects/geoserver/files/GeoServer/2.22.1/extensions/) +even though they are considered [stable plugins](https://sourceforge.net/projects/geoserver/files/GeoServer/2.22.2/extensions/) The image activates them on startup. The image provides the necessary plugin zip files which are used when activating the @@ -189,7 +189,7 @@ The environment variable `STABLE_EXTENSIONS` can be used to activate plugins lis Example ``` -ie VERSION=2.22.1 +ie VERSION=2.22.2 docker run -d -p 8600:8080 --name geoserver -e STABLE_EXTENSIONS=charts-plugin,db2-plugin kartoza/geoserver:${VERSION} ``` @@ -210,7 +210,7 @@ The environment variable `COMMUNITY_EXTENSIONS` can be used to activate plugins Example ``` -ie VERSION=2.22.1 +ie VERSION=2.22.2 docker run -d -p 8600:8080 --name geoserver -e COMMUNITY_EXTENSIONS=gwc-sqlite-plugin,ogr-datastore-plugin kartoza/geoserver:${VERSION} ``` @@ -228,7 +228,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 `SAMPLE_DATA=true` ``` -ie VERSION=2.22.1 +ie VERSION=2.22.2 docker run -d -p 8600:8080 --name geoserver -e SAMPLE_DATA=true kartoza/geoserver:${VERSION} ``` @@ -319,14 +319,14 @@ If you set the environment variable `SSL=true` but do not provide the pem files the container will generate a self-signed SSL certificates. ``` -ie VERSION=2.22.1 +ie VERSION=2.22.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.22.1 +ie VERSION=2.22.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} ``` @@ -402,7 +402,7 @@ To include Tomcat extras including docs, examples, and the manager webapp, set t to use a strong password otherwise the default one is set up. ``` -ie VERSION=2.22.1 +ie VERSION=2.22.2 docker run -it --name geoserver -e TOMCAT_EXTRAS=true -p 8600:8080 kartoza/geoserver:${VERSION} ``` @@ -429,7 +429,7 @@ If you have downloaded extra fonts you can mount the folder to the path path during initialisation. ``` -ie VERSION=2.22.1 +ie VERSION=2.22.2 docker run -v fonts:/opt/fonts -p 8080:8080 -t kartoza/geoserver:${VERSION} ``` diff --git a/clustering/docker-compose.yml b/clustering/docker-compose.yml index 4b635281..a4bb6a8c 100644 --- a/clustering/docker-compose.yml +++ b/clustering/docker-compose.yml @@ -19,7 +19,7 @@ services: healthcheck: test: "PGPASSWORD=docker pg_isready -h 127.0.0.1 -U docker -d gis" master: - image: kartoza/geoserver:2.22.1 + image: kartoza/geoserver:2.22.2 volumes: - geoserver-cluster-data:/opt/geoserver/data_dir ports: @@ -50,7 +50,7 @@ services: timeout: 10s retries: 3 node: - image: kartoza/geoserver:2.22.1 + image: kartoza/geoserver:2.22.2 volumes: - geoserver-cluster-data:/opt/geoserver/data_dir ports: