From a4345d11453fc7d80e7814c27605ce1a5caa23f8 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Wed, 8 Jan 2020 01:20:27 +0100
Subject: new versions for docker

---
 docker/gradle/Dockerfile                   | 14 +++++++++-----
 docker/gradle/files/build.gradle           |  6 ------
 docker/gradle/files/classpath/build.gradle |  6 ++++++
 docker/gradle/readme.md                    | 13 +++++++------
 4 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 docker/gradle/files/build.gradle
 create mode 100644 docker/gradle/files/classpath/build.gradle

(limited to 'docker/gradle')

diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index 2721f9b2..c4ea0704 100644
--- a/docker/gradle/Dockerfile
+++ b/docker/gradle/Dockerfile
@@ -1,10 +1,13 @@
 FROM ubuntu:18.04 as downloader
 
-ARG jdk=12
+ARG jdk=13
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
 RUN provision/jdk/java-${jdk}.sh
 
-ARG gradle=5.6
+ARG lombokjar=lombok.jar
+ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
+
+ARG gradle=6.0.1
 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
 RUN provision/gradle/gradle-${gradle}.sh
 
@@ -19,10 +22,11 @@ WORKDIR workspace
 
 ADD shared/ ./
 ADD gradle/files/ ./
-ARG lombokjar=lombok.jar
-ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
 
-ARG jdk=12
+COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
+COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
+
+ARG jdk=13
 ENV JDK_VERSION=${jdk}
 ENV JAVA_HOME=/opt/jdk
 ENV GRADLE_HOME=/opt/gradle/gradle
diff --git a/docker/gradle/files/build.gradle b/docker/gradle/files/build.gradle
deleted file mode 100644
index bbf276c7..00000000
--- a/docker/gradle/files/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
-	compileOnly files('lombok.jar')
-	annotationProcessor files('lombok.jar')
-}
\ No newline at end of file
diff --git a/docker/gradle/files/classpath/build.gradle b/docker/gradle/files/classpath/build.gradle
new file mode 100644
index 00000000..bbf276c7
--- /dev/null
+++ b/docker/gradle/files/classpath/build.gradle
@@ -0,0 +1,6 @@
+apply plugin: 'java'
+
+dependencies {
+	compileOnly files('lombok.jar')
+	annotationProcessor files('lombok.jar')
+}
\ No newline at end of file
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index 81f147d8..5aaf857a 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG gradle=5.6`
+### `ARG gradle=6.0.1`
 
 The gradle version to be used. Supported values:
 
-- `5.6` (default)
+- `6.0.1` (default)
+- `5.6`
 - `5.1.1`
 - `4.10.2`
 - `4.7`
@@ -17,17 +18,17 @@ The gradle version to be used. Supported values:
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-gradle-jdk12 -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk13 -f gradle/Dockerfile .
 
-docker build -t lombok-gradle-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-gradle-jdk12
+docker run -it lombok-gradle-jdk13
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk12
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk13
 ```
 
 ## Example container commands:
-- 
cgit