diff options
author | Roel Spilker <r.spilker@gmail.com> | 2020-01-08 01:20:27 +0100 |
---|---|---|
committer | Roel Spilker <r.spilker@gmail.com> | 2020-01-08 01:32:24 +0100 |
commit | a4345d11453fc7d80e7814c27605ce1a5caa23f8 (patch) | |
tree | d72ddb8d12c4adc2d78f3d06408c3f7ec486dd01 /docker/gradle/Dockerfile | |
parent | 20952446671d78533e3662bfa8206e3801c70b54 (diff) | |
download | lombok-a4345d11453fc7d80e7814c27605ce1a5caa23f8.tar.gz lombok-a4345d11453fc7d80e7814c27605ce1a5caa23f8.tar.bz2 lombok-a4345d11453fc7d80e7814c27605ce1a5caa23f8.zip |
new versions for docker
Diffstat (limited to 'docker/gradle/Dockerfile')
-rw-r--r-- | docker/gradle/Dockerfile | 14 |
1 files changed, 9 insertions, 5 deletions
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
|