diff --git a/Dockerfile b/Dockerfile index db8c16b..5903df0 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.25.2 +ARG GS_VERSION=2.25.3 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 ad70306..19e805c 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.25.2 +docker pull docker.osgeo.org/geoserver:2.25.3 ``` 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.2 +docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.25.3 ``` 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.2 +docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.25.3 ``` 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.25.2 + docker.osgeo.org/geoserver:2.25.3 ``` 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.25.2 + docker.osgeo.org/geoserver:2.25.3 ``` ## How to set the application context path? @@ -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.25.2 + docker.osgeo.org/geoserver:2.25.3 ``` 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.25.2 + docker.osgeo.org/geoserver:2.25.3 ``` ## 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.25.2 + docker.osgeo.org/geoserver:2.25.3 ``` **Note:** Do not change the target value! @@ -186,12 +186,12 @@ 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.2 + docker.osgeo.org/geoserver:2.25.3 ``` ## How to enable HTTPS? -To enable HTTPS, mount a JKS file to the container (ex. `/opt/keystore.jks`) and provide the following environment +To enable HTTPS, mount a JKS file to the container (ex. `/opt/keystore.jks`) and provide the following environment variables: * ``HTTPS_ENABLED`` to `true` diff --git a/RELEASE.md b/RELEASE.md index 849ceb9..c16cace 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.2 . +docker build -t geoserver-docker.osgeo.org/geoserver:2.25.3 . ``` 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.2 +docker push geoserver-docker.osgeo.org/geoserver:2.25.3 ``` ## 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.2` +`./release.sh build 2.25.3` -`./release.sh publish 2.25.2` +`./release.sh publish 2.25.3` -`./release.sh buildandpublish 2.25.2` +`./release.sh buildandpublish 2.25.3` `./release.sh buildandpublish 2.25-SNAPSHOT 1234` diff --git a/build/release.sh b/build/release.sh index 79cc3a3..9603c15 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.2, ${MAIN}-SNAPSHOT, ${MAIN}-RC)" + echo " version : The released version to build an docker image for (eg: 2.25.3, ${MAIN}-SNAPSHOT, ${MAIN}-RC)" echo " build : Build number (optional)" } diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml index b91653a..459bad4 100644 --- a/docker-compose-demo.yml +++ b/docker-compose-demo.yml @@ -4,7 +4,7 @@ services: build: context: . args: - - GEOSERVER_VERSION=2.25.2 + - GEOSERVER_VERSION=2.25.3 - CORS_ENABLED=true - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS ports: