From a4345d11453fc7d80e7814c27605ce1a5caa23f8 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Wed, 8 Jan 2020 01:20:27 +0100 Subject: new versions for docker --- docker/bazel/Dockerfile | 14 +++++++++----- docker/bazel/files/BUILD | 18 ------------------ docker/bazel/files/BUILD.lombok | 5 ----- docker/bazel/files/WORKSPACE | 5 ----- docker/bazel/files/classpath/BUILD | 18 ++++++++++++++++++ docker/bazel/files/classpath/BUILD.lombok | 5 +++++ docker/bazel/files/classpath/WORKSPACE | 5 +++++ docker/bazel/files/modules/readme.txt | 1 + docker/bazel/readme.md | 13 +++++++------ 9 files changed, 45 insertions(+), 39 deletions(-) delete mode 100644 docker/bazel/files/BUILD delete mode 100644 docker/bazel/files/BUILD.lombok delete mode 100644 docker/bazel/files/WORKSPACE create mode 100644 docker/bazel/files/classpath/BUILD create mode 100644 docker/bazel/files/classpath/BUILD.lombok create mode 100644 docker/bazel/files/classpath/WORKSPACE create mode 100644 docker/bazel/files/modules/readme.txt (limited to 'docker/bazel') diff --git a/docker/bazel/Dockerfile b/docker/bazel/Dockerfile index dd69273c..edc5e6fd 100644 --- a/docker/bazel/Dockerfile +++ b/docker/bazel/Dockerfile @@ -1,10 +1,13 @@ FROM ubuntu:18.04 as downloader -ARG jdk=12 +ARG jdk=13 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh RUN provision/jdk/java-${jdk}.sh -ARG bazel=0.28.1 +ARG lombokjar=lombok.jar +ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar + +ARG bazel=2.0.0 ADD provision/bazel/bazel-${bazel}.sh provision/bazel/bazel-${bazel}.sh RUN provision/bazel/bazel-${bazel}.sh @@ -20,10 +23,11 @@ WORKDIR workspace ADD shared/ ./ ADD bazel/files/ ./ -ARG lombokjar=lombok.jar -ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar -ARG jdk=12 +COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar +COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar + +ARG jdk=13 ENV JDK_VERSION=${jdk} ENV JAVA_HOME=/opt/jdk ENV BAZEL_HOME=/opt/bazel diff --git a/docker/bazel/files/BUILD b/docker/bazel/files/BUILD deleted file mode 100644 index 4a9c7655..00000000 --- a/docker/bazel/files/BUILD +++ /dev/null @@ -1,18 +0,0 @@ -java_binary( - name = "ProjectRunner", - main_class = "HelloWorld", - srcs = glob(["src/main/java/*.java"]), - deps = [":lombok"], -) - -java_plugin( - name = "lombok_plugin", - processor_class = "lombok.launch.AnnotationProcessorHider$AnnotationProcessor", - deps = ["@lombok_jar//:jar"], -) - -java_library( - name = "lombok", - exports = ["@lombok_jar//:jar"], - exported_plugins = [":lombok_plugin"], -) \ No newline at end of file diff --git a/docker/bazel/files/BUILD.lombok b/docker/bazel/files/BUILD.lombok deleted file mode 100644 index 06836d17..00000000 --- a/docker/bazel/files/BUILD.lombok +++ /dev/null @@ -1,5 +0,0 @@ -java_import( - name = "jar", - jars = ["lombok.jar"], - visibility = ["//visibility:public"] -) diff --git a/docker/bazel/files/WORKSPACE b/docker/bazel/files/WORKSPACE deleted file mode 100644 index 4b073ec8..00000000 --- a/docker/bazel/files/WORKSPACE +++ /dev/null @@ -1,5 +0,0 @@ -new_local_repository( - name = "lombok_jar", - path = "/workspace", - build_file = "BUILD.lombok", -) \ No newline at end of file diff --git a/docker/bazel/files/classpath/BUILD b/docker/bazel/files/classpath/BUILD new file mode 100644 index 00000000..4a9c7655 --- /dev/null +++ b/docker/bazel/files/classpath/BUILD @@ -0,0 +1,18 @@ +java_binary( + name = "ProjectRunner", + main_class = "HelloWorld", + srcs = glob(["src/main/java/*.java"]), + deps = [":lombok"], +) + +java_plugin( + name = "lombok_plugin", + processor_class = "lombok.launch.AnnotationProcessorHider$AnnotationProcessor", + deps = ["@lombok_jar//:jar"], +) + +java_library( + name = "lombok", + exports = ["@lombok_jar//:jar"], + exported_plugins = [":lombok_plugin"], +) \ No newline at end of file diff --git a/docker/bazel/files/classpath/BUILD.lombok b/docker/bazel/files/classpath/BUILD.lombok new file mode 100644 index 00000000..06836d17 --- /dev/null +++ b/docker/bazel/files/classpath/BUILD.lombok @@ -0,0 +1,5 @@ +java_import( + name = "jar", + jars = ["lombok.jar"], + visibility = ["//visibility:public"] +) diff --git a/docker/bazel/files/classpath/WORKSPACE b/docker/bazel/files/classpath/WORKSPACE new file mode 100644 index 00000000..d2974805 --- /dev/null +++ b/docker/bazel/files/classpath/WORKSPACE @@ -0,0 +1,5 @@ +new_local_repository( + name = "lombok_jar", + path = "/workspace/classpath", + build_file = "BUILD.lombok", +) \ No newline at end of file diff --git a/docker/bazel/files/modules/readme.txt b/docker/bazel/files/modules/readme.txt new file mode 100644 index 00000000..4dbb9323 --- /dev/null +++ b/docker/bazel/files/modules/readme.txt @@ -0,0 +1 @@ +not implemented \ No newline at end of file diff --git a/docker/bazel/readme.md b/docker/bazel/readme.md index 916b8718..86712231 100644 --- a/docker/bazel/readme.md +++ b/docker/bazel/readme.md @@ -2,11 +2,12 @@ [_(general configuration and options)_](../readme.md) -### `ARG bazel=0.28.1` +### `ARG bazel=2.0.0 The bazel version to be used. Supported values: -- `0.28.1` (default) +- `2.0.0` (default) +- `0.28.1` - `0.13.0` ## Example build commands: @@ -14,17 +15,17 @@ The bazel version to be used. Supported values: (To be executed from the `/docker` directory) ``` -docker build -t lombok-bazel-jdk12 -f bazel/Dockerfile . +docker build -t lombok-bazel-jdk13 -f bazel/Dockerfile . -docker build -t lombok-bazel-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile . +docker build -t lombok-bazel-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile . ``` ## Example run commands: ``` -docker run -it lombok-bazel-jdk12 +docker run -it lombok-bazel-jdk13 -docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk12 +docker run --rm -it -v //dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk13 ``` ## Example container commands: -- cgit