Merge branch 'geoserver:master' into support-tomcat-root
commit
a7a2e52f1c
10
Dockerfile
10
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
|
# GeoServer user => restrict access to $CATALINA_HOME and GeoServer directories
|
||||||
# See also CIS Docker benchmark and docker best practices
|
# See also CIS Docker benchmark and docker best practices
|
||||||
RUN chmod +x /opt/*.sh \
|
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
|
|
||||||
|
|
||||||
ENV WEBAPP_CONTEXT=geoserver
|
ENV WEBAPP_CONTEXT=geoserver
|
||||||
ENV HEALTHCHECK_URL=''
|
ENV HEALTHCHECK_URL=''
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# error out if any statements fail
|
# error out if any statements fail
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
MAIN="2.25"
|
MAIN="2.26"
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
echo "$0 <mode> <version> [<build>]"
|
echo "$0 <mode> <version> [<build>]"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue