Merge pull request #63 from alir/upgrade-2-25-2
chore: use geoserver 2.25.2 by defaultpull/45/head^2
commit
e7c0b55111
|
|
@ -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=''
|
||||
|
|
|
|||
18
README.md
18
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 <http://localhost/geoserver> 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?
|
||||
|
|
|
|||
10
RELEASE.md
10
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`
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ function usage() {
|
|||
echo "$0 <mode> <version> [<build>]"
|
||||
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)"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue