[directory-buildtools] branch master updated: Add OpenJDK 15 docker image

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-buildtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 90baa85  Add OpenJDK 15 docker image
90baa85 is described below

commit 90baa858a7611afda8a4952b89b299197d1615e7
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Jan 17 20:25:22 2021 +0100

    Add OpenJDK 15 docker image
---
 docker/maven-build/Dockerfile | 13 ++++---------
 docker/maven-build/README.md  | 12 +++++++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docker/maven-build/Dockerfile b/docker/maven-build/Dockerfile
index 6c7b529..25ba22d 100644
--- a/docker/maven-build/Dockerfile
+++ b/docker/maven-build/Dockerfile
@@ -18,20 +18,15 @@
 #
 
 ARG JDK_VERSION=8
-FROM maven:3-jdk-${JDK_VERSION}
+FROM maven:3-openjdk-${JDK_VERSION}-slim
 
 # Base images maven:3-jdk-8 and maven:3-jdk-11 are based on Debian
-# Base image maven:3-jdk-14 is based on Oracle Linux
+# Base images maven:3-adoptopenjdk-* are based on Debian
+# Base images maven:3-openjdk-*-slim are based on Debian
 RUN \
-if [ -e /etc/debian_version ]; then \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libgtk-3-0 libxtst6 xvfb krb5-config krb5-user dpkg rpm nsis && \
-    rm -rf /var/lib/apt/lists/* ; \
-elif [ -e /etc/oracle-release ]; then \
-    yum-config-manager --enable ol7_optional_latest && \
-    yum -y install xorg-x11-server-Xvfb xorg-x11-utils xorg-x11-server-utils gtk3 krb5-libs krb5-workstation rpm dpkg nsis && \
-    yum -y clean all ; \
-fi
+    rm -rf /var/lib/apt/lists/*
 
 # Create the temp dir for Xvfb
 RUN mkdir -p /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix
diff --git a/docker/maven-build/README.md b/docker/maven-build/README.md
index d494ca5..ccd216d 100644
--- a/docker/maven-build/README.md
+++ b/docker/maven-build/README.md
@@ -21,7 +21,7 @@
 A docker image for building Apache Directory projects. It's based on the official maven Docker images.
 
 It contains all tools required for building and testing:
-* Java (OpenJDK 8, 11, or 14)
+* Java (OpenJDK 8, 11, or 15)
 * Maven 3.6
 * Xvfb (required by Studio UI tests)
 * Kerberos client and krb5 config with EXAMPLE.COM realm (required by Studio UI tests)
@@ -31,9 +31,15 @@ It contains all tools required for building and testing:
 
 See <https://hub.docker.com/_/maven> for available Maven base image tags.
 
+Currently used:
+* 8: `maven:3-jdk-8`
+* 11: `maven:3-jdk-11`
+* 15: `maven:3-openjdk-15-slim`
+* 16: `maven:3-openjdk-16-slim`
+
 ```
-JDK_VERSION=8
-docker pull maven:3-jdk-${JDK_VERSION}
+JDK_VERSION=15
+docker pull maven:3-openjdk-${JDK_VERSION}-slim
 docker build -t apachedirectory/maven-build:jdk-${JDK_VERSION} --build-arg JDK_VERSION=${JDK_VERSION} .
 ```