update docker files and documentation

This commit is contained in:
Roel Spilker committed 2018-04-30 23:32:05 +02:00
1 parent 3ea12bdeba
commit 87ad2f6f59
9 files changed
+64 -23

No files matched your search

+2 -2
View File
@@ -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
+35
View File
@@ -0,0 +1,35 @@
<project name="example" default="dist" basedir=".">
<property name="src" location="src/main/java"/>
<property name="build" location="build"/>
<property name="dist" location="dist"/>
<property name="build.sysclasspath" value="ignore"/>
<target name="init">
<tstamp/>
<mkdir dir="${build}"/>
</target>
<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
</javac>
</target>
<target name="dist" depends="compile" description="generate the distribution">
<mkdir dir="${dist}/lib"/>
<jar jarfile="${dist}/lib/example-${DSTAMP}.jar" basedir="${build}"/>
</target>
<target name="clean" description="clean up">
<delete dir="${build}"/>
<delete dir="${dist}"/>
</target>
</project>
+4 -4
View File
@@ -13,17 +13,17 @@ The ant version to be used. Supported values:
(To be executed from the `<lombokhome>/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 /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk9
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk10
```
## Example container commands:
+3 -3
View File
@@ -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
+7 -6
View File
@@ -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:
+2 -2
View File
@@ -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
+4 -4
View File
@@ -13,17 +13,17 @@ The maven version to be used. Supported values:
(To be executed from the `<lombokhome>/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 /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk9
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk10
```
## Example container commands:
+4
View File
@@ -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
+3 -2
View File
@@ -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-<major.minor.build>.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`.