Merge pull request #41 from buehner/latest-versions

chore: use latest versions

.github/workflows/trivy.yml

@@ -6,10 +6,10 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build image
         run: docker build -t geoserver-docker.osgeo.org/geoserver:${{ github.sha }} .
       - name: Run trivy

BUILD.md

@@ -61,18 +61,18 @@ By default ``WAR_ZIP_URL``, ``STABLE_PLUGIN_URL`` make use of sourceforge downlo
 
 Override these arguments to make use of build.geoserver.org nightly releases:
 
-* ``--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/${GS_VERSION}/geoserver-${GS_VERSION}-latest-war.zip`` 
+* ``--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/${GS_VERSION}/geoserver-${GS_VERSION}-latest-war.zip``
 * ``--build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/${GS_VERSION}/ext-latest/``
 * ``--build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/${GS_VERSION}/community-latest/``
 
-Here is a working example for building 2.23.x nightly build::
+Here is a working example for building 2.24.x nightly build::
 ```
 docker build --no-cache-filter download,install \
-  --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/2.23.x/geoserver-2.23.x-latest-war.zip \
-  --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/2.23.x/ext-latest/ \
-  --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/2.23.x/community-latest/ \
-  --build-arg GS_VERSION=2.23-SNAPSHOT \
-  -t 2.23.x .
+  --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/2.24.x/geoserver-2.24.x-latest-war.zip \
+  --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/2.24.x/ext-latest/ \
+  --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/2.24.x/community-latest/ \
+  --build-arg GS_VERSION=2.24-SNAPSHOT \
+  -t 2.24.x .
 ```
 
 When running both stable extensions and community modules can be included:
@@ -82,7 +82,7 @@ docker run -it -p 80:8080 \
   --env INSTALL_EXTENSIONS=true \
   --env STABLE_EXTENSIONS="ysld" \
   --env COMMUNITY_EXTENSIONS="ogcapi" \
-  -t 2.23.x
+  -t 2.24.x
 ```
 
 Community modules are only available for nightly builds as they have not yet met the requirements for production use. Developers have shared these to attract participation, feedback and funding.
@@ -91,7 +91,7 @@ Community modules are only available for nightly builds as they have not yet met
 
 The build.geoserver.org output for the ``main`` branch requires the following:
 
-* ``--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip`` 
+* ``--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip``
 * ``--build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/main/ext-latest/``
 * ``--build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/main/community-latest/``
 

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:22.04 as tomcat
 
-ARG TOMCAT_VERSION=9.0.83
+ARG TOMCAT_VERSION=9.0.84
 ARG CORS_ENABLED=false
 ARG CORS_ALLOWED_ORIGINS=*
 ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS

README.md

@@ -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.:
 
 ```shell
-docker pull docker.osgeo.org/geoserver:2.23.1
+docker pull docker.osgeo.org/geoserver:2.24.1
 ```
 All the images can be found at: [https://repo.osgeo.org](https://repo.osgeo.org)
 
 Afterwards you can run the pulled image locally with:
 
 ```shell
-docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.23.1
+docker run -it -p 80:8080 docker.osgeo.org/geoserver:2.24.1
 ```
 
 Or if you want to start the container daemonized, use e.g.:
 
 ```shell
-docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.23.1
+docker run -d -p 80:8080 docker.osgeo.org/geoserver:2.24.1
 ```
 
 Check <http://localhost/geoserver> to see the geoserver page,
@@ -48,7 +48,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.23.1
+  docker.osgeo.org/geoserver:2.24.1
 ```
 
 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
 docker run -it -p 80:8080 \
   --env SKIP_DEMO_DATA=true \
-  docker.osgeo.org/geoserver:2.23.1
+  docker.osgeo.org/geoserver:2.24.1
 ```
 
 ## How to issue a redirect from the root ("/") to GeoServer web interface ("/geoserver/web")?
@@ -89,7 +89,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.23.1
+  docker.osgeo.org/geoserver:2.24.1
 ```
 
 The list of extensions (taken from SourceForge download page):
@@ -114,7 +114,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.23.1
+  docker.osgeo.org/geoserver:2.24.1
 ```
 
 ## How to add additional fonts to the docker image (e.g. for SLD styling)?
@@ -124,7 +124,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.23.1
+  docker.osgeo.org/geoserver:2.24.1
 ```
 
 **Note:** Do not change the target value!

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.23.1 .
+docker build -t geoserver-docker.osgeo.org/geoserver:2.24.1 .
 ```
 
 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.23.1
+docker push geoserver-docker.osgeo.org/geoserver:2.24.1
 ```
 
 ## 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.22.1`
+`./release.sh build 2.24.1`
 
-`./release.sh publish 2.23.1`
+`./release.sh publish 2.24.1`
 
-`./release.sh buildandpublish 2.22.1`
+`./release.sh buildandpublish 2.24.1`
 
 `./release.sh buildandpublish 2.24-SNAPSHOT 1234`

build/release.sh

@@ -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.23.1, ${MAIN}-SNAPSHOT, ${MAIN}-RC)"
+  echo " version : The released version to build an docker image for (eg: 2.24.1, ${MAIN}-SNAPSHOT, ${MAIN}-RC)"
   echo " build : Build number (optional)"
 }
 
@@ -47,7 +47,7 @@ else
   fi
 fi
 
-echo "Release from branch $BRANCH GeoServer $VERSION as $TAG" 
+echo "Release from branch $BRANCH GeoServer $VERSION as $TAG"
 
 # Go up one level to the Dockerfile
 cd ".."