From 975880abdbba376e75f06a5bd6bf0bb7f0a2a885 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Mon, 30 Oct 2017 23:25:25 +0100
Subject: use provisioning in docker to enable composition of versions

---
 docker/maven/Dockerfile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'docker/maven/Dockerfile')

diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile
index a41932c9..ac977a7a 100644
--- a/docker/maven/Dockerfile
+++ b/docker/maven/Dockerfile
@@ -1,18 +1,19 @@
 FROM ubuntu:16.04 as downloader
 
-RUN apt-get update && apt-get install wget -y
-RUN wget --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/9.0.1+11/jdk-9.0.1_linux-x64_bin.tar.gz -O jdk9_linux-x64_bin.tar.gz
-RUN tar -xzf jdk9_linux-x64_bin.tar.gz -C /opt/
+ARG jdk=1.9
+ADD provision/jdk/ provision/jdk/
+RUN provision/jdk/java-${jdk}.sh
 
-RUN wget http://www-us.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz -O maven.tar.gz
-RUN mkdir /usr/local/apache-maven/ && tar xvf maven.tar.gz -C /usr/local/apache-maven/
+ARG maven=3.5.0
+ADD provision/maven/maven-${maven}.sh provision/maven/maven-${maven}.sh
+RUN provision/maven/maven-${maven}.sh
 
 FROM ubuntu:16.04
 
 COPY --from=downloader /usr/local/apache-maven/ /usr/local/apache-maven/
-COPY --from=downloader /opt/jdk-9.0.1/ /opt/jdk-9.0.1/
+COPY --from=downloader /opt/jdk/ /opt/jdk/
 
-RUN update-alternatives  --install /usr/bin/java java /opt/jdk-9.0.1/bin/java 1000 && update-alternatives  --install /usr/bin/javac javac /opt/jdk-9.0.1/bin/javac 1000 && update-alternatives  --install /usr/bin/javadoc javadoc /opt/jdk-9.0.1/bin/javadoc 1000 && update-alternatives  --install /usr/bin/javap javap /opt/jdk-9.0.1/bin/javap 1000
+RUN update-alternatives  --install /usr/bin/java java /opt/jdk/bin/java 1000 && update-alternatives  --install /usr/bin/javac javac /opt/jdk/bin/javac 1000 && update-alternatives  --install /usr/bin/javadoc javadoc /opt/jdk/bin/javadoc 1000 && update-alternatives  --install /usr/bin/javap javap /opt/jdk/bin/javap 1000
 
 WORKDIR workspace
 
@@ -21,8 +22,10 @@ ADD maven/files/ ./
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
 
-ENV JAVA_HOME=/opt/jdk-9.0.1
-ENV M2_HOME=/usr/local/apache-maven/apache-maven-3.5.0
+ARG jdk
+ENV JDK_VERSION=${jdk}
+ENV JAVA_HOME=/opt/jdk
+ENV M2_HOME=/usr/local/apache-maven/apache-maven
 ENV M2=${M2_HOME}/bin 
 ENV PATH="${M2}:${JAVA_HOME}/bin:${PATH}"
 
-- 
cgit