Merge pull request AdoptOpenJDK#76 from grzesuav/71

Dinakar Guniguntala · web-flow · commit 047540bba24b · 2018-11-08T18:11:39.000+05:30
AdoptOpenJDK#71 - Update images used for full release build from 16.04 to 18.04 for JDK 8/9/10/11
diff --git a/10/jdk/ubuntu/Dockerfile.hotspot.releases.full b/10/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/10/jdk/ubuntu/Dockerfile.openj9.releases.full b/10/jdk/ubuntu/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.releases.full b/11/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/11/jdk/ubuntu/Dockerfile.openj9.releases.full b/11/jdk/ubuntu/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.releases.full b/8/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/8/jdk/ubuntu/Dockerfile.openj9.releases.full b/8/jdk/ubuntu/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/9/jdk/ubuntu/Dockerfile.hotspot.releases.full b/9/jdk/ubuntu/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/9/jdk/ubuntu/Dockerfile.openj9.releases.full b/9/jdk/ubuntu/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 
diff --git a/dockerfile_functions.sh b/dockerfile_functions.sh
@@ -43,12 +43,7 @@ print_ubuntu_ver() {
 	local_build=$2
 	local_build_type=$3
 
-# Use ubuntu:18.04 for the slim and nightly builds.
-if [ "${local_build}" == "nightly" -o "${local_build_type}" == "slim" ]; then
 	os_version="18.04"
-else
-	os_version="16.04"
-fi
 
 	cat >> $1 <<-EOI
 	FROM ubuntu:${os_version}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`# limitations under the License.`
`18`	`18`	`#`
`19`	`19`
`20`		`-FROM ubuntu:16.04`
	`20`	`+FROM ubuntu:18.04`
`21`	`21`
`22`	`22`	`MAINTAINER Dinakar Guniguntala <[email protected]> (@dinogun)`
`23`	`23`