From bf3e9683e329ef6fccd60c6f0e82be6bd2fdbc68 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Thu, 25 Apr 2019 09:00:22 +1000 Subject: [PATCH 1/2] Removing documentation for -slim variant as it is no longer provided. Signed-off-by: Avi Miller --- openjdk/variant-slim.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/openjdk/variant-slim.md b/openjdk/variant-slim.md index 7004227a3..e69de29bb 100644 --- a/openjdk/variant-slim.md +++ b/openjdk/variant-slim.md @@ -1,3 +0,0 @@ -## `%%IMAGE%%:-slim` - -This image installs the `-headless` package of OpenJDK and so is missing many of the UI-related Java libraries and some common packages contained in the default tag. It only contains the minimal packages needed to run Java. Unless you are working in an environment where *only* the `%%IMAGE%%` image will be deployed and you have space constraints, we highly recommend using the default image of this repository. From d2f31373a90ea6074ccc65fcc51d1042d6872297 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Thu, 25 Apr 2019 09:01:06 +1000 Subject: [PATCH 2/2] Adding documentation for default/oracle/oraclelinux7 variants which make it clear the OpenJDK official image is still released under the same GPLv2+CE license as before. Signed-off-by: Avi Miller --- openjdk/variant-oracle.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 openjdk/variant-oracle.md diff --git a/openjdk/variant-oracle.md b/openjdk/variant-oracle.md new file mode 100644 index 000000000..035bff620 --- /dev/null +++ b/openjdk/variant-oracle.md @@ -0,0 +1,5 @@ +## `%%IMAGE%%:` (from 12 onwards), `%%IMAGE%%:-oracle` and `%%IMAGE%%:-oraclelinux7` + +Starting with `openjdk:12` the default image as well as the `-oracle` and `-oraclelinux7` variants are based on the official [Oracle Linux 7 image](https://hub.docker.com/_/oraclelinux) which is provided under the GPLv2 as per the [Oracle Linux End User Agreement (EULA)](https://oss.oracle.com/ol7/EULA). + +The OpenJDK binaries in the default image as well as the `-oracle` and `-oraclelinux7` variants are built by Oracle and are sourced from the [OpenJDK community](https://openjdk.java.net/). These binaries are licensed under the [GPLv2 with the Classpath Exception](https://openjdk.java.net/legal/gplv2+ce.html).