From 7bf70ed638fac701c60e2fb29217af7c38056a8c Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 26 Aug 2019 23:49:22 +0200 Subject: [docker] use AdoptOpenJdk for all java releases, and add the latest version for all supported build systems --- docker/gradle/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/gradle/Dockerfile') diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile index 0b6f8d4c..2721f9b2 100644 --- a/docker/gradle/Dockerfile +++ b/docker/gradle/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:16.04 as downloader +FROM ubuntu:18.04 as downloader -ARG jdk=11 +ARG jdk=12 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh RUN provision/jdk/java-${jdk}.sh -ARG gradle=5.1.1 +ARG gradle=5.6 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh RUN provision/gradle/gradle-${gradle}.sh -FROM ubuntu:16.04 +FROM ubuntu:18.04 COPY --from=downloader /opt/gradle/ /opt/gradle/ COPY --from=downloader /opt/jdk/ /opt/jdk/ @@ -22,7 +22,7 @@ ADD gradle/files/ ./ ARG lombokjar=lombok.jar ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar -ARG jdk=11 +ARG jdk=12 ENV JDK_VERSION=${jdk} ENV JAVA_HOME=/opt/jdk ENV GRADLE_HOME=/opt/gradle/gradle -- cgit