scala agent vm fix for ,aster (#624)

opendevstack · Jul 9, 2021 · 22831ce · 22831ce
1 parent fbab798
commit 22831ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - ds-rshiny not able to deploy in OCP 4 ([#609](https://github.com/opendevstack/ods-quickstarters/issues/609))
 - fixed mixed line endings on multiple files ([#618](https://github.com/opendevstack/ods-quickstarters/issues/618))
 - fix dead sbt rpm bintray repo ([#622](https://github.com/opendevstack/ods-quickstarters/issues/622))
+- openjdk 11 does not recognize VM setting ([#623](https://github.com/opendevstack/ods-quickstarters/issues/623))
 
 ### Removed
 

diff --git a/common/jenkins-agents/scala/docker/Dockerfile.rhel7 b/common/jenkins-agents/scala/docker/Dockerfile.rhel7
@@ -16,6 +16,10 @@ RUN yum install -y java-11-openjdk-devel && \
     javac -version
 ENV JAVA_HOME=/usr/lib/jvm/jre
 
+# Container support is now integrated in Java 11, the +UseCGroupMemoryLimitForHeap option has been pruned
+ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryMapping=true"
+
+
 # Install sbt
 ENV SBT_VERSION=1.5.4
 ENV SBT_CREDENTIALS="$HOME/.sbt/.credentials"

diff --git a/common/jenkins-agents/scala/docker/Dockerfile.ubi8 b/common/jenkins-agents/scala/docker/Dockerfile.ubi8
@@ -16,6 +16,9 @@ RUN yum install -y --enablerepo centos-appstream java-11-openjdk-devel && \
     javac -version
 ENV JAVA_HOME=/usr/lib/jvm/jre
 
+# Container support is now integrated in Java 11, the +UseCGroupMemoryLimitForHeap option has been pruned
+ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryMapping=true"
+
 # Install sbt
 ENV SBT_VERSION=1.5.4
 ENV SBT_CREDENTIALS="$HOME/.sbt/.credentials"