From a79e67713a83a7c99d4a4b0f86c1120f7713f262 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Fri, 6 Mar 2020 00:32:44 +0100
Subject: docker image for gradle 6.2.2, try reproducing #2336

---
 docker/gradle/Dockerfile                | 2 +-
 docker/gradle/readme.md                 | 9 +++++----
 docker/provision/gradle/gradle-6.2.2.sh | 4 ++++
 docker/readme.md                        | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 docker/provision/gradle/gradle-6.2.2.sh

(limited to 'docker')

diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index c4ea0704..42c4775f 100644
--- a/docker/gradle/Dockerfile
+++ b/docker/gradle/Dockerfile
@@ -7,7 +7,7 @@ RUN provision/jdk/java-${jdk}.sh
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
 
-ARG gradle=6.0.1
+ARG gradle=6.2.2
 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
 RUN provision/gradle/gradle-${gradle}.sh
 
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index 5aaf857a..71a7da8e 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG gradle=6.0.1`
+### `ARG gradle=6.2.2`
 
 The gradle version to be used. Supported values:
 
-- `6.0.1` (default)
+- `6.2.2` (default)
+- `6.0.1`
 - `5.6`
 - `5.1.1`
 - `4.10.2`
@@ -28,11 +29,11 @@ docker build -t lombok-gradle-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f
 ```
 docker run -it lombok-gradle-jdk13
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk13
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/classpath/lombok.jar lombok-gradle-jdk13
 ```
 
 ## Example container commands:
 
 ```
 gradle assemble
-```
+```cd ...
diff --git a/docker/provision/gradle/gradle-6.2.2.sh b/docker/provision/gradle/gradle-6.2.2.sh
new file mode 100644
index 00000000..c19a49f3
--- /dev/null
+++ b/docker/provision/gradle/gradle-6.2.2.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget unzip
+wget https://services.gradle.org/distributions/gradle-6.2.2-bin.zip -O gradle.zip
+mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
+mv /opt/gradle/gradle-6.2.2 /opt/gradle/gradle
diff --git a/docker/readme.md b/docker/readme.md
index a7a6aca0..50a752ed 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -7,8 +7,8 @@ Each docker image contains a `/workspace` where all relevant files are located.
 
 ### `ARG lombokjar=lombok.jar`
 
-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`
+When building the image, a lombok.jar will be downloaded to `/workspace/classpath` and `/workspace/modules`.
+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=13`
 
-- 
cgit