diff --git a/openjdk/content.md b/openjdk/content.md index 0d6e18d0f475..dc35dfa42722 100644 --- a/openjdk/content.md +++ b/openjdk/content.md @@ -15,7 +15,7 @@ Java is a registered trademark of Oracle and/or its affiliates. The most straightforward way to use this image is to use a Java container as both the build and runtime environment. In your `Dockerfile`, writing something along the lines of the following will compile and run your project: ```dockerfile -FROM %%IMAGE%%:7 +FROM %%IMAGE%%:11 COPY . /usr/src/myapp WORKDIR /usr/src/myapp RUN javac Main.java @@ -34,7 +34,7 @@ $ docker run -it --rm --name my-running-app my-java-app There may be occasions where it is not appropriate to run your app inside a container. To compile, but not run your app inside the Docker instance, you can write something like: ```console -$ docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp %%IMAGE%%:7 javac Main.java +$ docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp %%IMAGE%%:11 javac Main.java ``` This will add your current directory as a volume to the container, set the working directory to the volume, and run the command `javac Main.java` which will tell Java to compile the code in `Main.java` and output the Java class file to `Main.class`. diff --git a/openjdk/variant-oracle.md b/openjdk/variant-oracle.md index 035bff6205c3..ba7ff1cb3aeb 100644 --- a/openjdk/variant-oracle.md +++ b/openjdk/variant-oracle.md @@ -1,5 +1,7 @@ -## `%%IMAGE%%:` (from 12 onwards), `%%IMAGE%%:-oracle` and `%%IMAGE%%:-oraclelinux7` +## `%%IMAGE%%:` (from 12 onwards), `%%IMAGE%%:-oracle` and `%%IMAGE%%:-oraclelinux8` -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). +Starting with `openjdk:12` the default image as well as the `-oracle` and `-oraclelinux8` variants are based on the official [Oracle Linux 8 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/ol8/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). +The `-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 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).