diff options
Diffstat (limited to 'docker/bazel')
| -rw-r--r-- | docker/bazel/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/bazel/files/classpath/BUILD (renamed from docker/bazel/files/BUILD) | 0 | ||||
| -rw-r--r-- | docker/bazel/files/classpath/BUILD.lombok (renamed from docker/bazel/files/BUILD.lombok) | 0 | ||||
| -rw-r--r-- | docker/bazel/files/classpath/WORKSPACE (renamed from docker/bazel/files/WORKSPACE) | 2 | ||||
| -rw-r--r-- | docker/bazel/files/modules/readme.txt | 1 | ||||
| -rw-r--r-- | docker/bazel/readme.md | 13 |
6 files changed, 18 insertions, 12 deletions
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/classpath/BUILD index 4a9c7655..4a9c7655 100644 --- a/docker/bazel/files/BUILD +++ b/docker/bazel/files/classpath/BUILD diff --git a/docker/bazel/files/BUILD.lombok b/docker/bazel/files/classpath/BUILD.lombok index 06836d17..06836d17 100644 --- a/docker/bazel/files/BUILD.lombok +++ b/docker/bazel/files/classpath/BUILD.lombok diff --git a/docker/bazel/files/WORKSPACE b/docker/bazel/files/classpath/WORKSPACE index 4b073ec8..d2974805 100644 --- a/docker/bazel/files/WORKSPACE +++ b/docker/bazel/files/classpath/WORKSPACE @@ -1,5 +1,5 @@ new_local_repository( name = "lombok_jar", - path = "/workspace", + 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 `<lombokhome>/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 /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk12 +docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk13 ``` ## Example container commands: |