Merge pull request #121 from grzesuav/79_tool_options

Dinakar Guniguntala · web-flow · commit 8e8420ea8dbe · 2019-03-14T15:14:08.000+05:30
Closes AdoptOpenJDK/openjdk-docker/issues#79 - Switch JAVA_TOOL_OPTIONS to use new container support flag
diff --git a/10/jdk/alpine/Dockerfile.hotspot.nightly.full b/10/jdk/alpine/Dockerfile.hotspot.nightly.full
@@ -86,4 +86,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/alpine/Dockerfile.hotspot.nightly.slim b/10/jdk/alpine/Dockerfile.hotspot.nightly.slim
@@ -92,4 +92,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/alpine/Dockerfile.hotspot.releases.full b/10/jdk/alpine/Dockerfile.hotspot.releases.full
@@ -74,4 +74,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/alpine/Dockerfile.hotspot.releases.slim b/10/jdk/alpine/Dockerfile.hotspot.releases.slim
@@ -80,4 +80,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/ubuntu/Dockerfile.hotspot.nightly.full b/10/jdk/ubuntu/Dockerfile.hotspot.nightly.full
@@ -63,4 +63,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/ubuntu/Dockerfile.hotspot.nightly.slim b/10/jdk/ubuntu/Dockerfile.hotspot.nightly.slim
@@ -70,4 +70,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/ubuntu/Dockerfile.hotspot.releases.full b/10/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -51,4 +51,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/10/jdk/ubuntu/Dockerfile.hotspot.releases.slim b/10/jdk/ubuntu/Dockerfile.hotspot.releases.slim
@@ -58,4 +58,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/alpine/Dockerfile.hotspot.nightly.full b/11/jdk/alpine/Dockerfile.hotspot.nightly.full
@@ -86,4 +86,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/alpine/Dockerfile.hotspot.nightly.slim b/11/jdk/alpine/Dockerfile.hotspot.nightly.slim
@@ -92,4 +92,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/alpine/Dockerfile.hotspot.releases.full b/11/jdk/alpine/Dockerfile.hotspot.releases.full
@@ -86,4 +86,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/alpine/Dockerfile.hotspot.releases.slim b/11/jdk/alpine/Dockerfile.hotspot.releases.slim
@@ -92,4 +92,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.nightly.full b/11/jdk/ubuntu/Dockerfile.hotspot.nightly.full
@@ -63,4 +63,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim b/11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim
@@ -70,4 +70,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.releases.full b/11/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -63,4 +63,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.releases.slim b/11/jdk/ubuntu/Dockerfile.hotspot.releases.slim
@@ -70,4 +70,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"
diff --git a/8/jdk/alpine/Dockerfile.hotspot.nightly.full b/8/jdk/alpine/Dockerfile.hotspot.nightly.full
@@ -86,4 +86,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/alpine/Dockerfile.hotspot.nightly.slim b/8/jdk/alpine/Dockerfile.hotspot.nightly.slim
@@ -92,4 +92,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/alpine/Dockerfile.hotspot.releases.full b/8/jdk/alpine/Dockerfile.hotspot.releases.full
@@ -86,4 +86,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/alpine/Dockerfile.hotspot.releases.slim b/8/jdk/alpine/Dockerfile.hotspot.releases.slim
@@ -92,4 +92,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.nightly.full b/8/jdk/ubuntu/Dockerfile.hotspot.nightly.full
@@ -63,4 +63,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim b/8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim
@@ -70,4 +70,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.releases.full b/8/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -63,4 +63,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.releases.slim b/8/jdk/ubuntu/Dockerfile.hotspot.releases.slim
@@ -70,4 +70,3 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
diff --git a/dockerfile_functions.sh b/dockerfile_functions.sh
@@ -271,11 +271,11 @@ print_java_options() {
 	case ${vm} in
 	hotspot)
 		case ${version} in
-		8|9)
+		9)
 			JOPTS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap";
 			;;
 		*)
-			JOPTS="-XX:+UseContainerSupport";
+			JOPTS="";
 			;;
 		esac
 		;;

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,3 @@ RUN set -eux; \`
`86`	`86`
`87`	`87`	`ENV JAVA_HOME=/opt/java/openjdk \`
`88`	`88`	`PATH="/opt/java/openjdk/bin:$PATH"`
`89`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -92,4 +92,3 @@ RUN set -eux; \`
`92`	`92`
`93`	`93`	`ENV JAVA_HOME=/opt/java/openjdk \`
`94`	`94`	`PATH="/opt/java/openjdk/bin:$PATH"`
`95`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,3 @@ RUN set -eux; \`
`74`	`74`
`75`	`75`	`ENV JAVA_HOME=/opt/java/openjdk \`
`76`	`76`	`PATH="/opt/java/openjdk/bin:$PATH"`
`77`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,3 @@ RUN set -eux; \`
`80`	`80`
`81`	`81`	`ENV JAVA_HOME=/opt/java/openjdk \`
`82`	`82`	`PATH="/opt/java/openjdk/bin:$PATH"`
`83`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,3 @@ RUN set -eux; \`
`63`	`63`
`64`	`64`	`ENV JAVA_HOME=/opt/java/openjdk \`
`65`	`65`	`PATH="/opt/java/openjdk/bin:$PATH"`
`66`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,3 @@ RUN set -eux; \`
`70`	`70`
`71`	`71`	`ENV JAVA_HOME=/opt/java/openjdk \`
`72`	`72`	`PATH="/opt/java/openjdk/bin:$PATH"`
`73`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,3 @@ RUN set -eux; \`
`51`	`51`
`52`	`52`	`ENV JAVA_HOME=/opt/java/openjdk \`
`53`	`53`	`PATH="/opt/java/openjdk/bin:$PATH"`
`54`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,3 @@ RUN set -eux; \`
`58`	`58`
`59`	`59`	`ENV JAVA_HOME=/opt/java/openjdk \`
`60`	`60`	`PATH="/opt/java/openjdk/bin:$PATH"`
`61`		`-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport"`