[docker] add jdk-17 and change line endings

This commit is contained in:
Roel Spilker committed 2023-09-15 00:50:22 +02:00
1 parent 000ce6d19a
commit f1fc67668a
13 files changed
+219 -108

No files matched your search

+4 -4
View File
@@ -1,6 +1,6 @@
FROM ubuntu:18.04 as downloader
FROM ubuntu:22.04 as downloader
ARG jdk=16
ARG jdk=17
ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
RUN provision/jdk/java-${jdk}.sh
@@ -11,7 +11,7 @@ ARG bazel=2.0.0
ADD provision/bazel/bazel-${bazel}.sh provision/bazel/bazel-${bazel}.sh
RUN provision/bazel/bazel-${bazel}.sh
FROM ubuntu:18.04
FROM ubuntu:22.04
COPY --from=downloader /opt/bazel/ /opt/bazel/
COPY --from=downloader /opt/jdk/ /opt/jdk/
@@ -27,7 +27,7 @@ ADD bazel/files/ ./
COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
ARG jdk=16
ARG jdk=17
ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
ENV BAZEL_HOME=/opt/bazel
+4 -4
View File
@@ -15,17 +15,17 @@ The bazel version to be used. Supported values:
(To be executed from the `<lombokhome>/docker` directory)
```
docker build -t lombok-bazel-jdk13 -f bazel/Dockerfile .
docker build -t lombok-bazel-jdk17 -f bazel/Dockerfile .
docker build -t lombok-bazel-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile .
docker build -t lombok-bazel-jdk17 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile .
```
## Example run commands:
```
docker run -it lombok-bazel-jdk13
docker run -it lombok-bazel-jdk17
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk13
docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk17
```
## Example container commands: