Merge remote-tracking branch 'origin/master' into support-tomcat-root

Tufts-Technology-Services · Jul 9, 2024 · a03ff2b · a03ff2b
2 parents 56b2c66 + c94bd75
commit a03ff2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -107,11 +107,6 @@ ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
 ENV HTTPS_KEYSTORE_PASSWORD=changeit
 ENV HTTPS_KEY_ALIAS=server
 
-ENV HTTPS_ENABLED=false
-ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
-ENV HTTPS_KEYSTORE_PASSWORD=changeit
-ENV HTTPS_KEY_ALIAS=server
-
 EXPOSE 8080
 EXPOSE 8443
 

diff --git a/README.md b/README.md
@@ -77,14 +77,14 @@ The following will serve GeoServer from the root (<http://localhost/>):
 ```shell
 docker run -it -p 80:8080 \
   --env WEBAPP_CONTEXT="" \
-  docker.osgeo.org/geoserver:2.24.1
+  docker.osgeo.org/geoserver:2.25.1
 ```
 
 The following will serve GeoServer from <http://localhost/my_context_path>:
 ```shell
 docker run -it -p 80:8080 \
   --env WEBAPP_CONTEXT="my_context_path" \
-  docker.osgeo.org/geoserver:2.24.1
+  docker.osgeo.org/geoserver:2.25.1
 ```