From ac2c46da3f5c2316eaadff625f06cb057d7a0c9e Mon Sep 17 00:00:00 2001 From: Mark Prins <1165786+mprins@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:12:34 +0100 Subject: [PATCH 1/2] Bump GeoServer version from 2.26.1 to 2.26.2 --- Dockerfile | 2 +- README.md | 22 +++++++++++----------- RELEASE.md | 10 +++++----- docker-compose-demo.yml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcd3008..43b6a18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG CORS_ALLOW_CREDENTIALS=false ARG CORS_ENABLED=false ARG GS_BUILD=release ARG GS_DATA_PATH=./geoserver_data/ -ARG GS_VERSION=2.26.1 +ARG GS_VERSION=2.26.2 ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip diff --git a/README.md b/README.md index bc791ef..a21d5d7 100644 --- a/README.md +++ b/README.md @@ -21,20 +21,20 @@ This README.md file covers use of official docker image, additional [build](BUIL To pull an official image use ``docker.osgeo.org/geoserver:{{VERSION}}``, e.g.: ```shell -docker pull docker.osgeo.org/geoserver:2.26.1 +docker pull docker.osgeo.org/geoserver:2.26.2 ``` All the images can be found at: [https://repo.osgeo.org](https://repo.osgeo.org/#browse/browse:geoserver-docker:v2/geoserver/tags) and the latest stable and maintenance version numbers can be obtained from [https://geoserver.org/download/](https://geoserver.org/download/) Afterwards you can run the pulled image locally with: ```shell -docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.26.1 +docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.26.2 ``` Or if you want to start the container daemonized, use e.g.: ```shell -docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.26.1 +docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.26.2 ``` Check to see the geoserver page, @@ -51,7 +51,7 @@ To use an external folder as your geoserver data directory. ```shell docker run -it -p 80:8080 \ --mount src="/absolute/path/on/host",target=/opt/geoserver_data/,type=bind \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` An empty data directory will be populated on first use. You can easily update GeoServer while @@ -66,7 +66,7 @@ The environment variable `SKIP_DEMO_DATA` can be set to `true` to create an empt ```shell docker run -it -p 80:8080 \ --env SKIP_DEMO_DATA=true \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` ## How to set the application context path? @@ -79,14 +79,14 @@ The following will serve GeoServer from the root (): ```shell docker run -it -p 80:8080 \ --env WEBAPP_CONTEXT="" \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` The following will serve GeoServer from : ```shell docker run -it -p 80:8080 \ --env WEBAPP_CONTEXT="my_context_path" \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` ## How to issue a redirect from the root ("/") to GeoServer web interface ("/geoserver/web")? @@ -116,7 +116,7 @@ Example installing wps and ysld extensions: ```shell docker run -it -p 80:8080 \ --env INSTALL_EXTENSIONS=true --env STABLE_EXTENSIONS="wps,ysld" \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` The list of extensions (taken from SourceForge download page): @@ -141,7 +141,7 @@ If you want to add geoserver extensions/libs, place the respective jar files in ```shell docker run -it -p 80:8080 \ --mount src="/dir/with/libs/on/host",target=/opt/additional_libs,type=bind \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` ## How to add additional fonts to the docker image (e.g. for SLD styling)? @@ -151,7 +151,7 @@ If you want to add custom fonts (the base image only contains 26 fonts) by using ```shell docker run -it -p 80:8080 \ --mount src="/dir/with/fonts/on/host",target=/opt/additional_fonts,type=bind \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` **Note:** Do not change the target value! @@ -189,7 +189,7 @@ Example: ```shell docker run -it -p 80:8080 \ --mount src="/path/to/my/server.xml",target=/opt/config_overrides/server.xml,type=bind \ - docker.osgeo.org/geoserver:2.26.1 + docker.osgeo.org/geoserver:2.26.2 ``` ## How to enable HTTPS? diff --git a/RELEASE.md b/RELEASE.md index 2b7156e..7e7cf1d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -7,7 +7,7 @@ OSGeo maintains geoserver-docker.osgeo.org repository for publishing. The result Build locally: ```shell -docker build -t geoserver-docker.osgeo.org/geoserver:2.26.1 . +docker build -t geoserver-docker.osgeo.org/geoserver:2.26.2 . ``` Login using with osgeo user id: @@ -19,7 +19,7 @@ docker login geoserver-docker.osgeo.org Push to osgeo repository: ```shell -docker push geoserver-docker.osgeo.org/geoserver:2.26.1 +docker push geoserver-docker.osgeo.org/geoserver:2.26.2 ``` ## How to automate release? @@ -34,10 +34,10 @@ The third, optional, is used to supply the jenkins build number - triggering a n Examples: -`./release.sh build 2.26.1` +`./release.sh build 2.26.2` -`./release.sh publish 2.26.1` +`./release.sh publish 2.26.2` -`./release.sh buildandpublish 2.26.1` +`./release.sh buildandpublish 2.26.2` `./release.sh buildandpublish 2.26-SNAPSHOT 1234` diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml index 355dae3..9056f89 100644 --- a/docker-compose-demo.yml +++ b/docker-compose-demo.yml @@ -4,7 +4,7 @@ services: build: context: . args: - - GEOSERVER_VERSION=2.26.1 + - GEOSERVER_VERSION=2.26.2 - CORS_ENABLED=true - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS ports: From 7b6ec7ccf52cb60b3ff7eaabb9e9e5a2e1d0a335 Mon Sep 17 00:00:00 2001 From: Mark Prins <1165786+mprins@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:18:04 +0100 Subject: [PATCH 2/2] update base image sha256 to latest --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43b6a18..8da37aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:9.0.98-jdk17-temurin-jammy@sha256:1f35364892e7d90cc6ccbfe23b03d84791fbaaf4197171ea3cdac6672983de2f +FROM tomcat:9.0.98-jdk17-temurin-jammy@sha256:4cce4376204e1b73ec6864988d6a7da3f7648fd5209442323fabaa00fbe6c335 LABEL vendor="osgeo.org" # Build arguments