[docker] use AdoptOpenJdk for all java releases, and add the latest version for all supported build systems

This commit is contained in:
Roel Spilker committed 2019-08-26 23:49:22 +02:00
1 parent ed3c8a67e2
commit 7bf70ed638
22 files changed
+204 -58

No files matched your search

+5 -5
View File
@@ -1,14 +1,14 @@
FROM ubuntu:16.04 as downloader
FROM ubuntu:18.04 as downloader
ARG jdk=11
ARG jdk=12
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
ARG ant=1.10.1
ARG ant=1.10.6
ADD provision/ant/ant-${ant}.sh provision/ant/ant-${ant}.sh
RUN provision/ant/ant-${ant}.sh
FROM ubuntu:16.04
FROM ubuntu:18.04
COPY --from=downloader /usr/local/apache-ant/ /usr/local/apache-ant/
COPY --from=downloader /opt/jdk/ /opt/jdk/
@@ -19,7 +19,7 @@ WORKDIR workspace
ADD shared/ ./
ARG jdk=11
ARG jdk=12
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>
+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>
+6 -5
View File
@@ -2,10 +2,11 @@
[_(general configuration and options)_](../readme.md)
### `ARG ant=1.10.1`
### `ARG ant=1.10.6`
The ant version to be used. Supported values:
- `1.10.6` (default)
- `1.10.1` (default)
## Example build commands:
@@ -13,17 +14,17 @@ The ant version to be used. Supported values:
(To be executed from the `<lombokhome>/docker` directory)
```
docker build -t lombok-ant-jdk10 -f ant/Dockerfile .
docker build -t lombok-ant-jdk12 -f ant/Dockerfile .
docker build -t lombok-ant-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f ant/Dockerfile .
docker build -t lombok-ant-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f ant/Dockerfile .
```
## Example run commands:
```
docker run -it lombok-ant-jdk10
docker run -it lombok-ant-jdk12
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk10
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk12
```
## Example container commands:
+5 -5
View File
@@ -1,14 +1,14 @@
FROM ubuntu:16.04 as downloader
FROM ubuntu:18.04 as downloader
ARG jdk=11
ARG jdk=12
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
ARG bazel=0.13.0
ARG bazel=0.28.1
ADD provision/bazel/bazel-${bazel}.sh provision/bazel/bazel-${bazel}.sh
RUN provision/bazel/bazel-${bazel}.sh
FROM ubuntu:16.04
FROM ubuntu:18.04
COPY --from=downloader /opt/bazel/ /opt/bazel/
COPY --from=downloader /opt/jdk/ /opt/jdk/
@@ -23,7 +23,7 @@ ADD bazel/files/ ./
ARG lombokjar=lombok.jar
ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
ARG jdk=11
ARG jdk=12
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV BAZEL_HOME=/opt/bazel
+7 -6
View File
@@ -2,28 +2,29 @@
[_(general configuration and options)_](../readme.md)
### `ARG bazel=0.13.0`
### `ARG bazel=0.28.1`
The bazel version to be used. Supported values:
- `0.13.0` (default)
- `0.28.1` (default)
- `0.13.0`
## Example build commands:
(To be executed from the `<lombokhome>/docker` directory)
```
docker build -t lombok-bazel-jdk10 -f bazel/Dockerfile .
docker build -t lombok-bazel-jdk12 -f bazel/Dockerfile .
docker build -t lombok-bazel-jdk10 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile .
docker build -t lombok-bazel-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile .
```
## Example run commands:
```
docker run -it lombok-bazel-jdk10
docker run -it lombok-bazel-jdk12
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk10
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk12
```
## Example container commands:
+5 -5
View File
@@ -1,14 +1,14 @@
FROM ubuntu:16.04 as downloader
FROM ubuntu:18.04 as downloader
ARG jdk=11
ARG jdk=12
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
ARG gradle=5.1.1
ARG gradle=5.6
ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
RUN provision/gradle/gradle-${gradle}.sh
FROM ubuntu:16.04
FROM ubuntu:18.04
COPY --from=downloader /opt/gradle/ /opt/gradle/
COPY --from=downloader /opt/jdk/ /opt/jdk/
@@ -22,7 +22,7 @@ ADD gradle/files/ ./
ARG lombokjar=lombok.jar
ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
ARG jdk=11
ARG jdk=12
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV GRADLE_HOME=/opt/gradle/gradle
+7 -6
View File
@@ -2,11 +2,12 @@
[_(general configuration and options)_](../readme.md)
### `ARG gradle=5.1.1`
### `ARG gradle=5.6`
The gradle version to be used. Supported values:
- `5.1.1` (default)
- `5.6` (default)
- `5.1.1`
- `4.10.2`
- `4.7`
- `4.2.1`
@@ -16,17 +17,17 @@ The gradle version to be used. Supported values:
(To be executed from the `<lombokhome>/docker` directory)
```
docker build -t lombok-gradle-jdk11 -f gradle/Dockerfile .
docker build -t lombok-gradle-jdk12 -f gradle/Dockerfile .
docker build -t lombok-gradle-jdk11 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
docker build -t lombok-gradle-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
```
## Example run commands:
```
docker run -it lombok-gradle-jdk11
docker run -it lombok-gradle-jdk12
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk11
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk12
```
## Example container commands:
+5 -5
View File
@@ -1,14 +1,14 @@
FROM ubuntu:16.04 as downloader
FROM ubuntu:18.04 as downloader
ARG jdk=11
ARG jdk=12
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
ARG maven=3.6.0
ARG maven=3.6.1
ADD provision/maven/maven-${maven}.sh provision/maven/maven-${maven}.sh
RUN provision/maven/maven-${maven}.sh
FROM ubuntu:16.04
FROM ubuntu:18.04
COPY --from=downloader /usr/local/apache-maven/ /usr/local/apache-maven/
COPY --from=downloader /opt/jdk/ /opt/jdk/
@@ -19,7 +19,7 @@ WORKDIR workspace
ADD shared/ ./
ARG jdk=11
ARG jdk=12
ADD maven/files/jdk-${jdk} ./
ARG lombokjar=lombok.jar
+53
View File
@@ -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>12</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>
+7 -6
View File
@@ -2,11 +2,12 @@
[_(general configuration and options)_](../readme.md)
### `ARG maven=3.6.0`
### `ARG maven=3.6.1`
The maven version to be used. Supported values:
- `3.6.0` (default)
- `3.6.1` (default)
- `3.6.0`
- `3.5.0`
## Example build commands:
@@ -14,17 +15,17 @@ The maven version to be used. Supported values:
(To be executed from the `<lombokhome>/docker` directory)
```
docker build -t lombok-maven-jdk11 -f maven/Dockerfile .
docker build -t lombok-maven-jdk12 -f maven/Dockerfile .
docker build -t lombok-maven-jdk11 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile .
docker build -t lombok-maven-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile .
```
## Example run commands:
```
docker run -it lombok-maven-jdk11
docker run -it lombok-maven-jdk12
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk11
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk12
```
## Example container commands:
+1 -1
View File
@@ -1,4 +1,4 @@
apt-get update && apt-get install -y wget
wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.gz -O ant.tar.gz
mkdir /usr/local/apache-ant/ && tar xvf ant.tar.gz -C /usr/local/apache-ant/
mv /usr/local/apache-ant/apache-ant-1.10.1 /usr/local/apache-ant/apache-ant
mv /usr/local/apache-ant/apache-ant-1.10.1 /usr/local/apache-ant/apache-ant
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget
wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.6-bin.tar.gz -O ant.tar.gz
mkdir /usr/local/apache-ant/ && tar xvf ant.tar.gz -C /usr/local/apache-ant/
mv /usr/local/apache-ant/apache-ant-1.10.6 /usr/local/apache-ant/apache-ant
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget pkg-config zip g++ zlib1g-dev unzip python
wget https://github.com/bazelbuild/bazel/releases/download/0.28.1/bazel-0.28.1-installer-linux-x86_64.sh -O bazel-installer.sh
chmod +x bazel-installer.sh
./bazel-installer.sh --prefix=/opt/bazel
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget unzip
wget https://services.gradle.org/distributions/gradle-5.6-bin.zip -O gradle.zip
mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
mv /opt/gradle/gradle-5.6 /opt/gradle/gradle
+2 -2
View File
@@ -1,4 +1,4 @@
apt-get update && apt-get install -y wget
wget https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
wget https://github.com/AdoptOpenJDK/openjdk10-releases/releases/download/jdk-10.0.2%2B13/OpenJDK10_x64_Linux_jdk-10.0.2%2B13.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-10.0.2 /opt/jdk
mv /opt/jdk-10.0.2+13 /opt/jdk
+2 -2
View File
@@ -1,4 +1,4 @@
apt-get update && apt-get install -y wget
wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-11.0.2 /opt/jdk
mv /opt/jdk-11.0.4+11 /opt/jdk
+4
View File
@@ -0,0 +1,4 @@
apt-get update && apt-get install -y wget
wget https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-12.0.2+10 /opt/jdk
+4 -6
View File
@@ -1,6 +1,4 @@
apt-get update && apt-get install -y software-properties-common
echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
add-apt-repository -y ppa:webupd8team/java
apt-get update && apt-get install -y oracle-java8-installer
mv /usr/lib/jvm/java-8-oracle /opt/jdk
apt-get update && apt-get install -y wget
wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk8u222-b10 /opt/jdk
+2 -2
View File
@@ -1,4 +1,4 @@
apt-get update && apt-get install -y wget
wget https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz -O jdk.tar.gz
wget https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -O jdk.tar.gz
tar -xzf jdk.tar.gz -C /opt/
mv /opt/jdk-9.0.4 /opt/jdk
mv /opt/jdk-9.0.4+11 /opt/jdk
+4
View File
@@ -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.1/apache-maven-3.6.1-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.1 /usr/local/apache-maven/apache-maven
+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=11`
### `ARG jdk=12`
The jdk version to be used. Supported values:
- `11` (default)
- `12` (default)
- `11`
- `10`
- `9`
- `8`