From 87ad2f6f5973c355131927d7c4250236c04f7eab Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 30 Apr 2018 23:32:05 +0200 Subject: update docker files and documentation --- docker/ant/Dockerfile | 4 ++-- docker/ant/files/jdk-10/build.xml | 35 +++++++++++++++++++++++++++++++++++ docker/ant/readme.md | 8 ++++---- docker/gradle/Dockerfile | 6 +++--- docker/gradle/readme.md | 13 +++++++------ docker/maven/Dockerfile | 4 ++-- docker/maven/readme.md | 8 ++++---- docker/provision/gradle/gradle-4.7.sh | 4 ++++ docker/readme.md | 5 +++-- 9 files changed, 64 insertions(+), 23 deletions(-) create mode 100644 docker/ant/files/jdk-10/build.xml create mode 100644 docker/provision/gradle/gradle-4.7.sh (limited to 'docker') diff --git a/docker/ant/Dockerfile b/docker/ant/Dockerfile index 32457709..b4789a2e 100644 --- a/docker/ant/Dockerfile +++ b/docker/ant/Dockerfile @@ -1,6 +1,6 @@ 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 @@ -19,7 +19,7 @@ WORKDIR workspace ADD shared/ ./ -ARG jdk=9 +ARG jdk=10 ADD ant/files/jdk-${jdk} ./ ARG lombokjar=lombok.jar diff --git a/docker/ant/files/jdk-10/build.xml b/docker/ant/files/jdk-10/build.xml new file mode 100644 index 00000000..3f181ed9 --- /dev/null +++ b/docker/ant/files/jdk-10/build.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docker/ant/readme.md b/docker/ant/readme.md index d6462523..6618cd03 100644 --- a/docker/ant/readme.md +++ b/docker/ant/readme.md @@ -13,17 +13,17 @@ The ant version to be used. Supported values: (To be executed from the `/docker` directory) ``` -docker build -t lombok-ant-jdk9 -f gradle/Dockerfile . +docker build -t lombok-ant-jdk10 -f ant/Dockerfile . -docker build -t lombok-ant-jdk9 --build-arg lombokjar=lombok-1.16.18.jar -f gradle/Dockerfile . +docker build -t lombok-ant-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f ant/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-ant-jdk9 +docker run -it lombok-ant-jdk10 -docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk9 +docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk10 ``` ## Example container commands: 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 `/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 //dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk9 +docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk10 ``` ## Example container commands: diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile index 83f124f1..a73faaf6 100644 --- a/docker/maven/Dockerfile +++ b/docker/maven/Dockerfile @@ -1,6 +1,6 @@ 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 @@ -19,7 +19,7 @@ WORKDIR workspace ADD shared/ ./ -ARG jdk=9 +ARG jdk=10 ADD maven/files/jdk-${jdk} ./ ARG lombokjar=lombok.jar diff --git a/docker/maven/readme.md b/docker/maven/readme.md index 20cf126f..15887fa5 100644 --- a/docker/maven/readme.md +++ b/docker/maven/readme.md @@ -13,17 +13,17 @@ The maven version to be used. Supported values: (To be executed from the `/docker` directory) ``` -docker build -t lombok-maven-jdk9 -f maven/Dockerfile . +docker build -t lombok-maven-jdk10 -f maven/Dockerfile . -docker build -t lombok-maven-jdk9 --build-arg lombokjar=lombok-1.16.18.jar -f maven/Dockerfile . +docker build -t lombok-maven-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-maven-jdk9 +docker run -it lombok-maven-jdk10 -docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk9 +docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk10 ``` ## Example container commands: diff --git a/docker/provision/gradle/gradle-4.7.sh b/docker/provision/gradle/gradle-4.7.sh new file mode 100644 index 00000000..a2e3ebec --- /dev/null +++ b/docker/provision/gradle/gradle-4.7.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget unzip +wget https://services.gradle.org/distributions/gradle-4.7-bin.zip -O gradle.zip +mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip +mv /opt/gradle/gradle-4.7 /opt/gradle/gradle diff --git a/docker/readme.md b/docker/readme.md index f6b6e550..a743e0c6 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -10,11 +10,12 @@ Each docker image contains a `/workspace` where all relevant files are located. 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-.jar` -### `ARG jdk=9` +### `ARG jdk=10` The jdk version to be used. Supported values: -- `9` (default) +- `10` (default) +- `9` (currently broken because the download is no longer available) - `8` The version is also accessible in `JDK_VERSION`. -- cgit