Bump version to 2.26.1

pull/130/head
Peter Smythe 2024-12-17 14:07:52 +02:00
parent c664d1b2e0
commit 47d58bdf86
4 changed files with 18 additions and 18 deletions

View File

@ -12,7 +12,7 @@ ARG CORS_ALLOW_CREDENTIALS=false
ARG CORS_ENABLED=false ARG CORS_ENABLED=false
ARG GS_BUILD=release ARG GS_BUILD=release
ARG GS_DATA_PATH=./geoserver_data/ ARG GS_DATA_PATH=./geoserver_data/
ARG GS_VERSION=2.26.0 ARG GS_VERSION=2.26.1
ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions 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 ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip

View File

@ -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.: To pull an official image use ``docker.osgeo.org/geoserver:{{VERSION}}``, e.g.:
```shell ```shell
docker pull docker.osgeo.org/geoserver:2.26.0 docker pull docker.osgeo.org/geoserver:2.26.1
``` ```
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/) 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: Afterwards you can run the pulled image locally with:
```shell ```shell
docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.26.0 docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.26.1
``` ```
Or if you want to start the container daemonized, use e.g.: Or if you want to start the container daemonized, use e.g.:
```shell ```shell
docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.26.0 docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.26.1
``` ```
Check <http://localhost/geoserver> to see the geoserver page, Check <http://localhost/geoserver> to see the geoserver page,
@ -51,7 +51,7 @@ To use an external folder as your geoserver data directory.
```shell ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--mount src="/absolute/path/on/host",target=/opt/geoserver_data/,type=bind \ --mount src="/absolute/path/on/host",target=/opt/geoserver_data/,type=bind \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
An empty data directory will be populated on first use. You can easily update GeoServer while 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 ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--env SKIP_DEMO_DATA=true \ --env SKIP_DEMO_DATA=true \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
## How to set the application context path? ## How to set the application context path?
@ -79,14 +79,14 @@ The following will serve GeoServer from the root (<http://localhost/>):
```shell ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--env WEBAPP_CONTEXT="" \ --env WEBAPP_CONTEXT="" \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
The following will serve GeoServer from <http://localhost/my_context_path>: The following will serve GeoServer from <http://localhost/my_context_path>:
```shell ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--env WEBAPP_CONTEXT="my_context_path" \ --env WEBAPP_CONTEXT="my_context_path" \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
## How to issue a redirect from the root ("/") to GeoServer web interface ("/geoserver/web")? ## 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 ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--env INSTALL_EXTENSIONS=true --env STABLE_EXTENSIONS="wps,ysld" \ --env INSTALL_EXTENSIONS=true --env STABLE_EXTENSIONS="wps,ysld" \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
The list of extensions (taken from SourceForge download page): 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 ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--mount src="/dir/with/libs/on/host",target=/opt/additional_libs,type=bind \ --mount src="/dir/with/libs/on/host",target=/opt/additional_libs,type=bind \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
## How to add additional fonts to the docker image (e.g. for SLD styling)? ## 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 ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--mount src="/dir/with/fonts/on/host",target=/opt/additional_fonts,type=bind \ --mount src="/dir/with/fonts/on/host",target=/opt/additional_fonts,type=bind \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
**Note:** Do not change the target value! **Note:** Do not change the target value!
@ -189,7 +189,7 @@ Example:
```shell ```shell
docker run -it -p 80:8080 \ docker run -it -p 80:8080 \
--mount src="/path/to/my/server.xml",target=/opt/config_overrides/server.xml,type=bind \ --mount src="/path/to/my/server.xml",target=/opt/config_overrides/server.xml,type=bind \
docker.osgeo.org/geoserver:2.26.0 docker.osgeo.org/geoserver:2.26.1
``` ```
## How to enable HTTPS? ## How to enable HTTPS?

View File

@ -7,7 +7,7 @@ OSGeo maintains geoserver-docker.osgeo.org repository for publishing. The result
Build locally: Build locally:
```shell ```shell
docker build -t geoserver-docker.osgeo.org/geoserver:2.26.0 . docker build -t geoserver-docker.osgeo.org/geoserver:2.26.1 .
``` ```
Login using with osgeo user id: Login using with osgeo user id:
@ -19,7 +19,7 @@ docker login geoserver-docker.osgeo.org
Push to osgeo repository: Push to osgeo repository:
```shell ```shell
docker push geoserver-docker.osgeo.org/geoserver:2.26.0 docker push geoserver-docker.osgeo.org/geoserver:2.26.1
``` ```
## How to automate release? ## How to automate release?
@ -34,10 +34,10 @@ The third, optional, is used to supply the jenkins build number - triggering a n
Examples: Examples:
`./release.sh build 2.26.0` `./release.sh build 2.26.1`
`./release.sh publish 2.26.0` `./release.sh publish 2.26.1`
`./release.sh buildandpublish 2.26.0` `./release.sh buildandpublish 2.26.1`
`./release.sh buildandpublish 2.26-SNAPSHOT 1234` `./release.sh buildandpublish 2.26-SNAPSHOT 1234`

View File

@ -4,7 +4,7 @@ services:
build: build:
context: . context: .
args: args:
- GEOSERVER_VERSION=2.26.0 - GEOSERVER_VERSION=2.26.1
- CORS_ENABLED=true - CORS_ENABLED=true
- CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
ports: ports: