From 7bf70ed638fac701c60e2fb29217af7c38056a8c Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Mon, 26 Aug 2019 23:49:22 +0200
Subject: [docker] use AdoptOpenJdk for all java releases, and add the latest
 version for all supported build systems

---
 docker/bazel/Dockerfile | 10 +++++-----
 docker/bazel/readme.md  | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'docker/bazel')

diff --git a/docker/bazel/Dockerfile b/docker/bazel/Dockerfile
index 007b7a5b..dd69273c 100644
--- a/docker/bazel/Dockerfile
+++ b/docker/bazel/Dockerfile
@@ -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
diff --git a/docker/bazel/readme.md b/docker/bazel/readme.md
index 2bed86f1..916b8718 100644
--- a/docker/bazel/readme.md
+++ b/docker/bazel/readme.md
@@ -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:
-- 
cgit