From ee3f7df6eb420c2ccc184dfdd9d1b1c714d855d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20B=C3=BChner?= Date: Tue, 20 Feb 2024 15:34:56 +0100 Subject: [PATCH 1/4] fix: do not run as custom user --- Dockerfile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f465b0d..f0f2c6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -141,15 +141,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true # GeoServer user => restrict access to $CATALINA_HOME and GeoServer directories # See also CIS Docker benchmark and docker best practices -RUN chmod +x /opt/*.sh \ - && groupadd geoserver \ - && useradd --no-log-init -u 2000 -r -g geoserver geoserver \ - && chown -R geoserver:geoserver $CATALINA_HOME \ - && chmod g-w,o-rwx $CATALINA_HOME \ - && chown -R geoserver:geoserver $GEOSERVER_DATA_DIR \ - && chown -R geoserver:geoserver $GEOSERVER_LIB_DIR - -USER geoserver +RUN chmod +x /opt/*.sh ENTRYPOINT ["/opt/startup.sh"] From fd39d4fabf5beb407a3f4359ad3ecf88de1e0870 Mon Sep 17 00:00:00 2001 From: Jody Garnett Date: Mon, 4 Mar 2024 22:18:25 -0800 Subject: [PATCH 2/4] Update release.sh to indicate main is 2.26 branch --- build/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/release.sh b/build/release.sh index 99a5c5e..a946b43 100755 --- a/build/release.sh +++ b/build/release.sh @@ -3,7 +3,7 @@ # error out if any statements fail set -e -MAIN="2.25" +MAIN="2.26" function usage() { echo "$0 []" From e2ac59468f47b8d87474ea714edea91c3c938053 Mon Sep 17 00:00:00 2001 From: Peter Smythe Date: Wed, 24 Apr 2024 16:18:03 +0200 Subject: [PATCH 3/4] Update README.md Easily find latest version numbers --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b236764..88099b1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ To pull an official image use ``docker.osgeo.org/geoserver:{{VERSION}}``, e.g.: ```shell docker pull docker.osgeo.org/geoserver:2.24.1 ``` -All the images can be found at: [https://repo.osgeo.org](https://repo.osgeo.org) +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: From 795acadadc5e5c08064894be8c6f9dacd0b9f282 Mon Sep 17 00:00:00 2001 From: Iceflower Date: Thu, 25 Apr 2024 16:03:02 +0200 Subject: [PATCH 4/4] Fix env var default values --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88099b1..92afca9 100644 --- a/README.md +++ b/README.md @@ -183,11 +183,11 @@ Following is the list of the all the environment variables that can be passed do | VAR NAME | DESCRIPTION | SAMPLE VALUE | |--------------|-----------|------------| | 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.75` | +| CATALINA_HOME | CATALINA home path | `/opt/apache-tomcat-9.0.86` | | 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_ALLOWED_ORIGINS | CORS origins configuration | `*` | -| CORS_ALLOWED_METHODS | CORS method configuration | `GET,POST` | +| CORS_ALLOWED_METHODS | CORS method configuration | `GET,POST,PUT,DELETE,HEAD,OPTIONS` | | CORS_ALLOWED_HEADERS | CORS headers configuration | `*` | | DEBIAN_FRONTEND | Configures the Debian package manager frontend | `noninteractive`| | CATALINA_OPTS | Catalina options. Check [ref](https://www.baeldung.com/tomcat-catalina_opts-vs-java_opts) | `-Djava.awt.headless=true` |