[docker] change default jdk to 21

This commit is contained in:
Roel Spilker committed 2023-09-20 15:26:11 +02:00
1 parent bb32d1f0fd
commit cb0072ecbd
5 files changed
+11 -16

No files matched your search

+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:22.04 as downloader
ARG jdk=17
ARG jdk=21
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -22,7 +22,7 @@ WORKDIR workspace
ADD shared/ ./
ARG jdk=17
ARG jdk=21
ADD ant/files/jdk-${jdk} ./
COPY --from=downloader /lombok.jar /workspace/lombok.jar
+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:22.04 as downloader
ARG jdk=17
ARG jdk=21
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -28,7 +28,7 @@ ADD bazel/files/ ./
COPY --from=downloader /lombok.jar /workspace/lombok.jar
ARG jdk=17
ARG jdk=21
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV BAZEL_HOME=/opt/bazel
+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:22.04 as downloader
ARG jdk=17
ARG jdk=21
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -25,7 +25,7 @@ ADD gradle/files/ ./
COPY --from=downloader /lombok.jar /workspace/lombok.jar
ARG jdk=17
ARG jdk=21
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV GRADLE_HOME=/opt/gradle/gradle
+2 -2
View File
@@ -1,6 +1,6 @@
FROM ubuntu:22.04 as downloader
ARG jdk=17
ARG jdk=21
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -22,7 +22,7 @@ WORKDIR workspace
ADD shared/ ./
ARG jdk=17
ARG jdk=21
ADD maven/files/jdk-${jdk} ./
COPY --from=downloader /lombok.jar /workspace/lombok.jar
+3 -8
View File
@@ -10,17 +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/classpath` and `/workspace/modules`.
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=13`
### `ARG jdk=21`
The jdk version to be used. Supported values:
- `21` (based on openjdk instead of adoptium)
- `17` (default)
- `16`
- `13
- `12`
- `21` (default)(based on openjdk instead of adoptium)
- `17`
- `11`
- `10`
- `9`
- `8`
The version is also accessible in `JDK_VERSION`.