steve
/
geoserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59 from buehner/gs-2.25.1-tomcat-9.0.89 

chore: use latest tomcat and geoserver versions
pull/47/head^2
Nils Bühner 2024-05-29 13:18:06 +02:00 committed by GitHub
parent 6a203332f5 ef8d2afa95
commit 77945ab50d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:22.04 as tomcat FROM ubuntu:22.04 as tomcat
ARG TOMCAT_VERSION=9.0.86 ARG TOMCAT_VERSION=9.0.89
ARG CORS_ENABLED=false ARG CORS_ENABLED=false
ARG CORS_ALLOWED_ORIGINS=* ARG CORS_ALLOWED_ORIGINS=*
ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS
@ -56,7 +56,7 @@ RUN apt purge -y \
FROM tomcat as download FROM tomcat as download
ARG GS_VERSION=2.24.1 ARG GS_VERSION=2.25.1
ARG GS_BUILD=release ARG GS_BUILD=release
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
ENV GEOSERVER_VERSION=$GS_VERSION ENV GEOSERVER_VERSION=$GS_VERSION
@ -72,7 +72,7 @@ RUN echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}" \
FROM tomcat as install FROM tomcat as install
ARG GS_VERSION=2.24.1 ARG GS_VERSION=2.25.1
ARG GS_BUILD=release ARG GS_BUILD=release
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 COMMUNITY_PLUGIN_URL='' ARG COMMUNITY_PLUGIN_URL=''

20
README.md
View File

@ -18,20 +18,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.24.1 docker pull docker.osgeo.org/geoserver:2.25.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.24.1 docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.25.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.24.1 docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.25.1
``` ```
Check <http://localhost/geoserver> to see the geoserver page, Check <http://localhost/geoserver> to see the geoserver page,
@ -48,7 +48,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.24.1 docker.osgeo.org/geoserver:2.25.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
@ -63,7 +63,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.24.1 docker.osgeo.org/geoserver:2.25.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")?
@ -93,7 +93,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.24.1 docker.osgeo.org/geoserver:2.25.1
``` ```
The list of extensions (taken from SourceForge download page): The list of extensions (taken from SourceForge download page):
@ -118,7 +118,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.24.1 docker.osgeo.org/geoserver:2.25.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)?
@ -128,7 +128,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.24.1 docker.osgeo.org/geoserver:2.25.1
``` ```
**Note:** Do not change the target value! **Note:** Do not change the target value!
@ -163,7 +163,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.24.1 docker.osgeo.org/geoserver:2.25.1
``` ```
## How to use the docker-compose demo? ## How to use the docker-compose demo?
@ -183,7 +183,7 @@ Following is the list of the all the environment variables that can be passed do
| VAR NAME | DESCRIPTION | SAMPLE VALUE | | VAR NAME | DESCRIPTION | SAMPLE VALUE |
|--------------|-----------|------------| |--------------|-----------|------------|
| PATH | Used by geoserver internally to find all the libs | `/usr/local/sbin:/usr/local/bin:` | | PATH | Used by geoserver internally to find all the libs | `/usr/local/sbin:/usr/local/bin:` |
| CATALINA_HOME | CATALINA home path | `/opt/apache-tomcat-9.0.86` | | CATALINA_HOME | CATALINA home path | `/opt/apache-tomcat-9.0.89` |
| EXTRA_JAVA_OPTS | Used to pass params to the JAVA environment. Check [ref](https://docs.oracle.com/en/java/javase/11/tools/java.html) | `-Xms256m -Xmx1g` | | EXTRA_JAVA_OPTS | Used to pass params to the JAVA environment. Check [ref](https://docs.oracle.com/en/java/javase/11/tools/java.html) | `-Xms256m -Xmx1g` |
| CORS_ENABLED | CORS enabled configuration | `false` | | CORS_ENABLED | CORS enabled configuration | `false` |
| CORS_ALLOWED_ORIGINS | CORS origins configuration | `*` | | CORS_ALLOWED_ORIGINS | CORS origins configuration | `*` |

10
RELEASE.md
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.24.1 . docker build -t geoserver-docker.osgeo.org/geoserver:2.25.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.24.1 docker push geoserver-docker.osgeo.org/geoserver:2.25.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.24.1` `./release.sh build 2.25.1`
`./release.sh publish 2.24.1` `./release.sh publish 2.25.1`
`./release.sh buildandpublish 2.24.1` `./release.sh buildandpublish 2.25.1`
`./release.sh buildandpublish 2.24-SNAPSHOT 1234` `./release.sh buildandpublish 2.24-SNAPSHOT 1234`

2
build/release.sh
View File

@ -9,7 +9,7 @@ function usage() {
echo "$0 <mode> <version> [<build>]" echo "$0 <mode> <version> [<build>]"
echo "" echo ""
echo " mode : The mode. Choose one of 'build', 'publish' or 'buildandpublish'" echo " mode : The mode. Choose one of 'build', 'publish' or 'buildandpublish'"
echo " version : The released version to build an docker image for (eg: 2.24.1, ${MAIN}-SNAPSHOT, ${MAIN}-RC)" echo " version : The released version to build an docker image for (eg: 2.25.1, ${MAIN}-SNAPSHOT, ${MAIN}-RC)"
echo " build : Build number (optional)" echo " build : Build number (optional)"
} }

2
docker-compose-demo.yml
View File

@ -4,7 +4,7 @@ services:
build: build:
context: . context: .
args: args:
- GEOSERVER_VERSION=2.24.1 - GEOSERVER_VERSION=2.25.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: