AdoptOpenJDK#71 - Update images used for full release build from 16.0…

…4 to 18.04 for JDK 8/9/10/11
grzesuav · Nov 7, 2018 · ca30c4f · ca30c4f
1 parent 50cb647
commit ca30c4f
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 13 deletions.
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}