Merge pull request #588 from geoserver/backport-583-to-release/1.9.x

[Backport release/1.9.x] Make runtime and AppCDs build steps have matching +UseCompressedOops JVM setting

compose/.env

@@ -25,7 +25,7 @@ DISCOVERY_SERVER_DEFAULT_PROFILES=${LOGGING_PROFILE}
 # For more information, see https://cloud.spring.io/spring-cloud-config/multi/multi__spring_cloud_config_server.html#_git_backend
 CONFIG_SERVER_DEFAULT_PROFILES=${LOGGING_PROFILE},native,standalone
 
-JAVA_OPTS_DEFAULT=-XshowSettings:system -Dlogging.config=file:/etc/geoserver/logback-spring.xml
+JAVA_OPTS_DEFAULT=-XshowSettings:system -Dlogging.config=file:/etc/geoserver/logback-spring.xml -Xlog:cds
 
 JAVA_OPTS_DISCOVERY=$JAVA_OPTS_DEFAULT
 JAVA_OPTS_CONFIG=$JAVA_OPTS_DEFAULT

src/apps/base-images/jre/Dockerfile

@@ -15,7 +15,8 @@ ENV DEFAULT_JAVA_TOOL_OPTIONS="\
 --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \
 -Djava.awt.headless=true \
 -XX:MaxRAMPercentage=80 \
--XX:InitialRAMPercentage=30"
+-XX:InitialRAMPercentage=30 \
+-XX:+UseCompressedOops"
 
 ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS}"
 ENV JAVA_OPTS=

src/apps/geoserver/gwc/Dockerfile

@@ -32,4 +32,4 @@ RUN java \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"

src/apps/geoserver/restconfig/Dockerfile

@@ -27,9 +27,9 @@ RUN java \
 -XX:ArchiveClassesAtExit=application.jsa \
 -Dspring.context.exit=onRefreshed \
 -Dspring.profiles.active=standalone,datadir,offline \
--Dgeosever.backend.data-directory.location=/tmp/tmpdatadir \
 -Dserver.port=0 -Dmanagement.server.port=0 \
+-Dgeosever.backend.data-directory.location=/tmp/tmpdatadir \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"

src/apps/geoserver/wcs/Dockerfile

@@ -27,9 +27,9 @@ RUN java \
 -XX:ArchiveClassesAtExit=application.jsa \
 -Dspring.context.exit=onRefreshed \
 -Dspring.profiles.active=standalone,datadir,offline \
--Dgeosever.backend.data-directory.location=/tmp/tmpdatadir \
 -Dserver.port=0 -Dmanagement.server.port=0 \
+-Dgeosever.backend.data-directory.location=/tmp/tmpdatadir \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"

src/apps/geoserver/webui/Dockerfile

@@ -32,4 +32,4 @@ RUN java \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"

src/apps/geoserver/wfs/Dockerfile

@@ -32,4 +32,4 @@ RUN java \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"

src/apps/geoserver/wms/Dockerfile

@@ -32,4 +32,4 @@ RUN java \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"

src/apps/geoserver/wps/Dockerfile

@@ -32,4 +32,4 @@ RUN java \
 org.springframework.boot.loader.JarLauncher
 RUN rm -rf /tmp/*
 
-ENV JAVA_TOOL_OPTIONS="${DEFAULT_JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"
+ENV JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -XX:SharedArchiveFile=application.jsa"