diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2018-04-30 23:32:05 +0200 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2018-04-30 23:32:05 +0200 |
| commit | 87ad2f6f5973c355131927d7c4250236c04f7eab (patch) | |
| tree | d2cb387a5d85c3d2f0a7958bbee0348dd19f761c /docker/gradle | |
| parent | 3ea12bdeba0936b4022e731282fd33c9c077e2d7 (diff) | |
| download | lombok-87ad2f6f5973c355131927d7c4250236c04f7eab.tar.gz lombok-87ad2f6f5973c355131927d7c4250236c04f7eab.tar.bz2 lombok-87ad2f6f5973c355131927d7c4250236c04f7eab.zip | |
update docker files and documentation
Diffstat (limited to 'docker/gradle')
| -rw-r--r-- | docker/gradle/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/gradle/readme.md | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile index 938d417e..204fe00f 100644 --- a/docker/gradle/Dockerfile +++ b/docker/gradle/Dockerfile @@ -1,10 +1,10 @@ FROM ubuntu:16.04 as downloader
-ARG jdk=9
+ARG jdk=10
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
-ARG gradle=4.2.1
+ARG gradle=4.7
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=9
+ARG jdk=10
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 efe4f237..486b430b 100644 --- a/docker/gradle/readme.md +++ b/docker/gradle/readme.md @@ -2,28 +2,29 @@ [_(general configuration and options)_](../readme.md) -### `ARG gradle=4.2.1` +### `ARG gradle=4.7` The gradle version to be used. Supported values: -- `4.2.1` (default) +- `4.7` (default) +- `4.2.1` ## Example build commands: (To be executed from the `<lombokhome>/docker` directory) ``` -docker build -t lombok-gradle-jdk9 -f gradle/Dockerfile . +docker build -t lombok-gradle-jdk10 -f gradle/Dockerfile . -docker build -t lombok-gradle-jdk9 --build-arg lombokjar=lombok-1.16.18.jar -f gradle/Dockerfile . +docker build -t lombok-gradle-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-gradle-jdk9 +docker run -it lombok-gradle-jdk10 -docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk9 +docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk10 ``` ## Example container commands: |