From 2f195e5dcdfeb7aa855e6d09e0ca58c220897a59 Mon Sep 17 00:00:00 2001 From: Ali Raja Date: Fri, 19 Jul 2024 13:06:34 +0100 Subject: [PATCH] chore: use geoserver version 2.25.2 --- Dockerfile | 4 ++-- README.md | 18 +++++++++--------- RELEASE.md | 10 +++++----- build/release.sh | 2 +- docker-compose-demo.yml | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdeb81c..a8974ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ RUN apt purge -y \ FROM tomcat as download -ARG GS_VERSION=2.25.1 +ARG GS_VERSION=2.25.2 ARG GS_BUILD=release ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip ENV GEOSERVER_VERSION=$GS_VERSION @@ -72,7 +72,7 @@ RUN echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}" \ FROM tomcat as install -ARG GS_VERSION=2.25.1 +ARG GS_VERSION=2.25.2 ARG GS_BUILD=release ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions ARG COMMUNITY_PLUGIN_URL='' diff --git a/README.md b/README.md index 37fe1ec..f4a668f 100644 --- a/README.md +++ b/README.md @@ -20,20 +20,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.25.1 +docker pull docker.osgeo.org/geoserver:2.25.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.25.1 +docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.25.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.25.1 +docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.25.2 ``` Check to see the geoserver page, @@ -50,7 +50,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.25.1 + docker.osgeo.org/geoserver:2.25.2 ``` An empty data directory will be populated on first use. You can easily update GeoServer while @@ -65,7 +65,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.25.1 + docker.osgeo.org/geoserver:2.25.2 ``` ## How to issue a redirect from the root ("/") to GeoServer web interface ("/geoserver/web")? @@ -95,7 +95,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.25.1 + docker.osgeo.org/geoserver:2.25.2 ``` The list of extensions (taken from SourceForge download page): @@ -120,7 +120,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.25.1 + docker.osgeo.org/geoserver:2.25.2 ``` ## How to add additional fonts to the docker image (e.g. for SLD styling)? @@ -130,7 +130,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.25.1 + docker.osgeo.org/geoserver:2.25.2 ``` **Note:** Do not change the target value! @@ -165,7 +165,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.25.1 + docker.osgeo.org/geoserver:2.25.2 ``` ## How to enable HTTPS? diff --git a/RELEASE.md b/RELEASE.md index 806b83d..952d955 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.25.1 . +docker build -t geoserver-docker.osgeo.org/geoserver:2.25.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.25.1 +docker push geoserver-docker.osgeo.org/geoserver:2.25.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.25.1` +`./release.sh build 2.25.2` -`./release.sh publish 2.25.1` +`./release.sh publish 2.25.2` -`./release.sh buildandpublish 2.25.1` +`./release.sh buildandpublish 2.25.2` `./release.sh buildandpublish 2.24-SNAPSHOT 1234` diff --git a/build/release.sh b/build/release.sh index b740716..1728f1f 100755 --- a/build/release.sh +++ b/build/release.sh @@ -9,7 +9,7 @@ function usage() { echo "$0 []" echo "" echo " mode : The mode. Choose one of 'build', 'publish' or 'buildandpublish'" - echo " version : The released version to build an docker image for (eg: 2.25.1, ${MAIN}-SNAPSHOT, ${MAIN}-RC)" + echo " version : The released version to build an docker image for (eg: 2.25.2, ${MAIN}-SNAPSHOT, ${MAIN}-RC)" echo " build : Build number (optional)" } diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml index d5f49db..4816c18 100644 --- a/docker-compose-demo.yml +++ b/docker-compose-demo.yml @@ -4,7 +4,7 @@ services: build: context: . args: - - GEOSERVER_VERSION=2.25.1 + - GEOSERVER_VERSION=2.25.2 - CORS_ENABLED=true - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS ports: