diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gradle/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/gradle/readme.md | 13 | ||||
| -rw-r--r-- | docker/maven/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/maven/files/jdk-11/pom.xml | 53 | ||||
| -rw-r--r-- | docker/maven/readme.md | 13 | ||||
| -rw-r--r-- | docker/provision/gradle/gradle-5.1.1.sh | 4 | ||||
| -rw-r--r-- | docker/provision/jdk/java-11.sh | 4 | ||||
| -rw-r--r-- | docker/provision/maven/maven-3.6.0.sh | 4 |
8 files changed, 79 insertions, 16 deletions
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile index 77f08fe2..0b6f8d4c 100644 --- a/docker/gradle/Dockerfile +++ b/docker/gradle/Dockerfile @@ -4,7 +4,7 @@ ARG jdk=11 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
-ARG gradle=4.10.2
+ARG gradle=5.1.1
ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
RUN provision/gradle/gradle-${gradle}.sh
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md index 9744d0ad..a106b569 100644 --- a/docker/gradle/readme.md +++ b/docker/gradle/readme.md @@ -2,11 +2,12 @@ [_(general configuration and options)_](../readme.md) -### `ARG gradle=4.10.2` +### `ARG gradle=5.1.1` The gradle version to be used. Supported values: -- `4.10.2` (default) +- `5.1.1` (default) +- `4.10.2` - `4.7` - `4.2.1` @@ -15,17 +16,17 @@ The gradle version to be used. Supported values: (To be executed from the `<lombokhome>/docker` directory) ``` -docker build -t lombok-gradle-jdk10 -f gradle/Dockerfile . +docker build -t lombok-gradle-jdk11 -f gradle/Dockerfile . -docker build -t lombok-gradle-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile . +docker build -t lombok-gradle-jdk11 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-gradle-jdk10 +docker run -it lombok-gradle-jdk11 -docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk10 +docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk11 ``` ## Example container commands: diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile index 14328486..f5433882 100644 --- a/docker/maven/Dockerfile +++ b/docker/maven/Dockerfile @@ -4,7 +4,7 @@ ARG jdk=11 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
-ARG maven=3.5.0
+ARG maven=3.6.0
ADD provision/maven/maven-${maven}.sh provision/maven/maven-${maven}.sh
RUN provision/maven/maven-${maven}.sh
diff --git a/docker/maven/files/jdk-11/pom.xml b/docker/maven/files/jdk-11/pom.xml new file mode 100644 index 00000000..58a66c4d --- /dev/null +++ b/docker/maven/files/jdk-11/pom.xml @@ -0,0 +1,53 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>com.example</groupId> + <artifactId>lombok-jdk-${env.JDK_VERSION}</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <java.version>11</java.version> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <fork>true</fork> + <compilerargs> + <arg>-Werror</arg> + <arg>-Xlint:all</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> + <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> + </compilerargs> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.2.3</version> + <scope>system</scope> + <systemPath>/workspace/lombok.jar</systemPath> + </dependency> + </dependencies> + +</project>
\ No newline at end of file diff --git a/docker/maven/readme.md b/docker/maven/readme.md index 15887fa5..8a784eb8 100644 --- a/docker/maven/readme.md +++ b/docker/maven/readme.md @@ -2,28 +2,29 @@ [_(general configuration and options)_](../readme.md) -### `ARG maven=3.5.0` +### `ARG maven=3.6.0` The maven version to be used. Supported values: -- `3.5.0` (default) +- `3.6.0` (default) +- `3.5.0` ## Example build commands: (To be executed from the `<lombokhome>/docker` directory) ``` -docker build -t lombok-maven-jdk10 -f maven/Dockerfile . +docker build -t lombok-maven-jdk11 -f maven/Dockerfile . -docker build -t lombok-maven-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile . +docker build -t lombok-maven-jdk11 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-maven-jdk10 +docker run -it lombok-maven-jdk11 -docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk10 +docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk11 ``` ## Example container commands: diff --git a/docker/provision/gradle/gradle-5.1.1.sh b/docker/provision/gradle/gradle-5.1.1.sh new file mode 100644 index 00000000..1bbce91a --- /dev/null +++ b/docker/provision/gradle/gradle-5.1.1.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget unzip +wget https://services.gradle.org/distributions/gradle-5.1.1-bin.zip -O gradle.zip +mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip +mv /opt/gradle/gradle-5.1.1 /opt/gradle/gradle diff --git a/docker/provision/jdk/java-11.sh b/docker/provision/jdk/java-11.sh index 0d43bbca..6252c2ae 100644 --- a/docker/provision/jdk/java-11.sh +++ b/docker/provision/jdk/java-11.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz +wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt/ -mv /opt/jdk-11.0.1 /opt/jdk +mv /opt/jdk-11.0.2 /opt/jdk
\ No newline at end of file diff --git a/docker/provision/maven/maven-3.6.0.sh b/docker/provision/maven/maven-3.6.0.sh new file mode 100644 index 00000000..7f9b0453 --- /dev/null +++ b/docker/provision/maven/maven-3.6.0.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.tar.gz -O maven.tar.gz +mkdir /usr/local/apache-maven/ && tar xvf maven.tar.gz -C /usr/local/apache-maven/ +mv /usr/local/apache-maven/apache-maven-3.6.0 /usr/local/apache-maven/apache-maven |