add jdk11 to docker builds

This commit is contained in:
Roel Spilker
2018-10-30 00:50:24 +01:00
parent 03365378e9
commit f5b106971a
9 changed files with 26 additions and 16 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:16.04 as downloader
ARG jdk=10
ARG jdk=11
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -19,7 +19,7 @@ WORKDIR workspace
ADD shared/ ./
ARG jdk=10
ARG jdk=11
ADD ant/files/jdk-${jdk} ./
ARG lombokjar=lombok.jar
+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:16.04 as downloader
ARG jdk=10
ARG jdk=11
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -23,7 +23,7 @@ ADD bazel/files/ ./
ARG lombokjar=lombok.jar
ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
ARG jdk=10
ARG jdk=11
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV BAZEL_HOME=/opt/bazel
+3 -3
View File
@@ -1,10 +1,10 @@
FROM ubuntu:16.04 as downloader
ARG jdk=10
ARG jdk=11
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
ARG gradle=4.7
ARG gradle=4.10.2
ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
RUN provision/gradle/gradle-${gradle}.sh
@@ -22,7 +22,7 @@ ADD gradle/files/ ./
ARG lombokjar=lombok.jar
ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
ARG jdk=10
ARG jdk=11
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV GRADLE_HOME=/opt/gradle/gradle
+3 -2
View File
@@ -2,11 +2,12 @@
[_(general configuration and options)_](../readme.md)
### `ARG gradle=4.7`
### `ARG gradle=4.10.2`
The gradle version to be used. Supported values:
- `4.7` (default)
- `4.10.2` (default)
- `4.7`
- `4.2.1`
## Example build commands:
+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:16.04 as downloader
ARG jdk=10
ARG jdk=11
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -19,7 +19,7 @@ WORKDIR workspace
ADD shared/ ./
ARG jdk=10
ARG jdk=11
ADD maven/files/jdk-${jdk} ./
ARG lombokjar=lombok.jar
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget unzip
wget https://services.gradle.org/distributions/gradle-4.10.2-bin.zip -O gradle.zip
mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
mv /opt/gradle/gradle-4.10.2 /opt/gradle/gradle
+2 -2
View File
@@ -1,4 +1,4 @@
apt-get update && apt-get install -y wget
wget -c --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/10.0.1+10/fb4372174a714e6b8c52526dc134031e/jdk-10.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz
wget https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-10.0.1 /opt/jdk
mv /opt/jdk-10.0.2 /opt/jdk
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget
wget https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-11.0.1 /opt/jdk
+4 -3
View File
@@ -10,12 +10,13 @@ Each docker image contains a `/workspace` where all relevant files are located.
When building the image, a lombok.jar will be downloaded to `/workspace`. By default, this is the latest released version. You
can download a specific version by adding `--build-arg lombokjar=lombok-<major.minor.build>.jar`
### `ARG jdk=10`
### `ARG jdk=11`
The jdk version to be used. Supported values:
- `10` (default)
- `9` (OpenJDK)
- `11` (default)
- `10`
- `9`
- `8`
The version is also accessible in `JDK_VERSION`.