From 7bf70ed638fac701c60e2fb29217af7c38056a8c Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
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 +++++-----
 docker/gradle/readme.md  | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'docker/gradle')

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
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index a106b569..81f147d8 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG gradle=5.1.1`
+### `ARG gradle=5.6`
 
 The gradle version to be used. Supported values:
 
-- `5.1.1` (default)
+- `5.6` (default)
+- `5.1.1`
 - `4.10.2`
 - `4.7`
 - `4.2.1`
@@ -16,17 +17,17 @@ The gradle version to be used. Supported values:
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-gradle-jdk11 -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk12 -f gradle/Dockerfile .
 
-docker build -t lombok-gradle-jdk11 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-gradle-jdk11
+docker run -it lombok-gradle-jdk12
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk11
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk12
 ```
 
 ## Example container commands:
-- 
cgit