Include JDK 9 in the dev tools image

luontola · Dec 27, 2017 · 04c3533 · 04c3533
1 parent 6039108
commit 04c3533
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -31,7 +31,9 @@ Using the Docker-based Development Environment
 To avoid having to install all the Java versions on your computer, there is a
 Docker image for building Retrolambda.
 
-The image is already in Docker Hub, but it can also be built locally with:
+The image is already in Docker Hub, but it can also be built locally with the
+following command. But first you need to download the JDK 5 and 9 installers
+into the `dev/installers` directory and install [Rocker](https://github.com/grammarly/rocker).
 
     make
 

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ current_path := $(dir $(mkfile_path))
 
 # Builds the development docker file
 docker-build:
-	docker build --tag=$(TAG) ./dev
+	rocker build --var Tag=$(TAG) --file dev/Rockerfile
 
 # Clean this docker image
 docker-clean:

diff --git a/dev/Dockerfile → dev/Rockerfile b/dev/Dockerfile → dev/Rockerfile
@@ -1,21 +1,26 @@
 FROM centos:7
 
-# Install all supported JDK versions
-RUN curl -L --header "Cookie: oraclelicense=accept-securebackup-cookie" \
-		http://download.oracle.com/otn-pub/java/jdk/1.5.0_22/jdk-1_5_0_22-linux-amd64-rpm.bin \
-		-o jdk-1_5_0_22-linux-amd64-rpm.bin \
+# Install JDK 5
+MOUNT installers:/installers
+RUN cd /installers \
 	&& chmod u+x jdk-1_5_0_22-linux-amd64-rpm.bin \
-	&& echo yes | ./jdk-1_5_0_22-linux-amd64-rpm.bin \
-	&& rm -v jdk-1_5_0_22-linux-amd64* \
-	&& yum -y install \
+	&& echo yes | ./jdk-1_5_0_22-linux-amd64-rpm.bin
+
+# Install JDK 6, 7, 8
+RUN yum -y install \
 		java-1.6.0-openjdk-devel \
 		java-1.7.0-openjdk-devel \
 		java-1.8.0-openjdk-devel \
 	&& yum clean all
+
+# Install JDK 9
+RUN rpm -Uvh /installers/jdk-9.0.1_linux-x64_bin.rpm
+
 ENV JAVA5_HOME=/usr/java/jdk1.5.0_22
 ENV JAVA6_HOME=/usr/lib/jvm/java-1.6.0
 ENV JAVA7_HOME=/usr/lib/jvm/java-1.7.0
 ENV JAVA8_HOME=/usr/lib/jvm/java-1.8.0
+ENV JAVA9_HOME=/usr/java/jdk-9.0.1
 ENV JAVA_HOME=$JAVA8_HOME
 
 # Install Maven
@@ -29,3 +34,4 @@ COPY toolchains.xml /root/.m2/
 
 RUN mkdir /project
 WORKDIR /project
+TAG {{ .Tag }}
diff --git a/dev/installers/.gitignore b/dev/installers/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore