diff options
Diffstat (limited to 'docker/ant/Dockerfile')
-rw-r--r-- | docker/ant/Dockerfile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docker/ant/Dockerfile b/docker/ant/Dockerfile index 69b465e8..57a2faf9 100644 --- a/docker/ant/Dockerfile +++ b/docker/ant/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 ant=1.10.6 +ARG lombokjar=lombok.jar +ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar + +ARG ant=1.10.7 ADD provision/ant/ant-${ant}.sh provision/ant/ant-${ant}.sh RUN provision/ant/ant-${ant}.sh @@ -19,11 +22,11 @@ WORKDIR workspace ADD shared/ ./ -ARG jdk=12 +ARG jdk=13 ADD ant/files/jdk-${jdk} ./ -ARG lombokjar=lombok.jar -ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar +COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar +COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar ENV JDK_VERSION=${jdk} ENV JAVA_HOME=/opt/jdk |