Merge remote-tracking branch 'origin/master' into support-tomcat-root
commit
a03ff2b0fe
|
|
@ -107,11 +107,6 @@ ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
|
||||||
ENV HTTPS_KEYSTORE_PASSWORD=changeit
|
ENV HTTPS_KEYSTORE_PASSWORD=changeit
|
||||||
ENV HTTPS_KEY_ALIAS=server
|
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 8080
|
||||||
EXPOSE 8443
|
EXPOSE 8443
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,14 +77,14 @@ The following will serve GeoServer from the root (<http://localhost/>):
|
||||||
```shell
|
```shell
|
||||||
docker run -it -p 80:8080 \
|
docker run -it -p 80:8080 \
|
||||||
--env WEBAPP_CONTEXT="" \
|
--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>:
|
The following will serve GeoServer from <http://localhost/my_context_path>:
|
||||||
```shell
|
```shell
|
||||||
docker run -it -p 80:8080 \
|
docker run -it -p 80:8080 \
|
||||||
--env WEBAPP_CONTEXT="my_context_path" \
|
--env WEBAPP_CONTEXT="my_context_path" \
|
||||||
docker.osgeo.org/geoserver:2.24.1
|
docker.osgeo.org/geoserver:2.25.1
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue