October2020 cpu readme (oracle#1724)

* Updated readmes for Oracle JDK and Oracle OpenJDK
callum-tait-pbx · Sep 30, 2020 · c6ae6c2 · c6ae6c2
1 parent 5b92ea1
commit c6ae6c2
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 40 deletions.
diff --git a/OracleJava/11/Dockerfile b/OracleJava/11/Dockerfile
@@ -16,12 +16,12 @@
 # -----------------------
 # Put all downloaded files in the same directory as this Dockerfile
 # Run:
-#      $ docker build -t oracle/jdk:11 ..
+#      $ docker build -t oracle/jdk:11 .
 #
-# This command is already scripted on build.sh so you can alternatively run
+# This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
 #
-# The builder image will be use to uncompress the tar.gz file with the Java Runtime.
+# The builder image will be used to uncompress the tar.gz file with the Java Runtime.
 
 FROM oraclelinux:7-slim as builder
 

diff --git a/OracleJava/14/Dockerfile b/OracleJava/14/Dockerfile
@@ -16,12 +16,12 @@
 # -----------------------
 # Put all downloaded files in the same directory as this Dockerfile
 # Run:
-#      $ docker build -t oracle/jdk:14 ..
+#      $ docker build -t oracle/jdk:14 .
 #
-# This command is already scripted on build.sh so you can alternatively run
+# This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
 #
-# The builder image will be use to uncompress the tar.gz file with the Java Runtime.
+# The builder image will be used to uncompress the tar.gz file with the Java Runtime.
 
 FROM oraclelinux:7-slim as builder
 

diff --git a/OracleJava/15/Dockerfile b/OracleJava/15/Dockerfile
@@ -16,12 +16,12 @@
 # -----------------------
 # Put all downloaded files in the same directory as this Dockerfile
 # Run:
-#      $ docker build -t oracle/jdk:15 ..
+#      $ docker build -t oracle/jdk:15 .
 #
-# This command is already scripted on build.sh so you can alternatively run
+# This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
 #
-# The builder image will be use to uncompress the tar.gz file with the Java Runtime.
+# The builder image will be used to uncompress the tar.gz file with the Java Runtime.
 
 FROM oraclelinux:7-slim as builder
 

diff --git a/OracleJava/8/Dockerfile b/OracleJava/8/Dockerfile
@@ -18,10 +18,10 @@
 # Run:
 #      $ docker build -t oracle/serverjre:8 .
 #
-# This command is already scripted on build.sh so you can alternatively run
+# This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
 #
-# The builder image will be use to uncompress the tar.gz file with the Java Runtime.
+# The builder image will be used to uncompress the tar.gz file with the Java Runtime.
 
 FROM oraclelinux:7-slim as builder
 

diff --git a/OracleJava/README.md b/OracleJava/README.md
@@ -1,44 +1,38 @@
 Oracle Java on Docker
 =====
-This repository contains a sample Docker configuration to facilitate installation and environment setup for DevOps users. This project includes a Dockerfile for JDK 14, JDK 11, and Server JRE 8 based on Oracle Linux.
+This repository contains sample Docker configurations to facilitate installation and environment setup for DevOps users. This project includes Dockerfiles based on Oracle Linux with JDK images of currently supported versions 11 and later and for Server JRE 8.
 
 Oracle Java Server JRE provides the features from Oracle Java JDK commonly required for server-side applications (i.e. Running a Java EE application server). For more information about Server JRE, visit the [Understanding the Server JRE blog entry](https://blogs.oracle.com/java-platform-group/understanding-the-server-jre) from the Java Product Management team.
 
-## Building the Java 14 (JDK) base image
-[Download JDK 14](https://www.oracle.com/java/technologies/javase-jdk14-downloads.html) `.tar.gz` file and drop it inside the folder `../OracleJava/14`.
+## Building the Oracle Java base image
+Download the linux x-64 compressed archive (tar.gz) [JDK or Server JRE] (https://www.oracle.com/in/java/technologies/javase-downloads.html) for the version you want to create an image of and place it in the same directory as the corresponding Dockerfile.
 
-Build it using:
+e.g. for JDK 14 download jdk-14[X]_linux-x64_bin.tar.gz into OracleJava/14, 
+for ServerJRE 8 download server-jre-8uXXX-linux-x64.tar.gz into OracleJava/8
 
+Navigate to the folder containing the download and run docker build. Tag it with the correct version number.
+
+e.g. For JDK 14 run
 ```
 $ cd ../OracleJava/14
 $ docker build -t oracle/jdk:14 .
 ```
 
-## Building the Java 11 (JDK) base image
-[Download JDK 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) `.tar.gz` file and drop it inside the folder `../OracleJava/11`.
-
-Build it using:
-
+for Server JRE 8 run
 ```
-$ cd ../OracleJava/11
-$ docker build -t oracle/jdk:11 .
+$ cd ../OracleJava/8
+$ docker build -t oracle/serverjre:8 .
 ```
 
-
-## Building the Java 8 (Server JRE) base image
-[Download Server JRE 8](https://www.oracle.com/java/technologies/javase-server-jre8-downloads.html) `.tar.gz` file and drop it inside the folder `../OracleJava/8`.
-
-Build it using:
-
+The right command with the correct tag is already scripted in build.sh so you can alternatively run:
 ```
-$ cd ../OracleJava/8
-$ docker build -t oracle/serverjre:8 .
+$ bash build.sh
 ```
 
 ## License
-To download and run the Oracle JDK, regardless of inside or outside a Docker container, you must download the binary from the Oracle website and accept the license indicated on that page.
+To download and run the Oracle JDK or Server JRE, regardless of inside or outside a Docker container, you must download the binary from the Oracle website and accept the license indicated on that page.
 
 All scripts and files hosted in this project and GitHub [`docker/OracleJava`](./) repository, required to build the Docker images are, unless otherwise noted, released under the [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
 ## Customer Support
-We support JDK 8 (Server JRE) and JDK 11 when running on certified operating systems in a Docker container. For additional details on the JDK Certified System Configurations, please refer to the [Oracle Java SE Certified System Configuration Pages](https://www.oracle.com/technetwork/java/javaseproducts/documentation/index.html#sysconfig).
+Oracle offers support for JDK 8 (Server JRE), JDK 11, JDK 14 and JDK 15 when running on certified operating systems in a Docker container. For additional details on the JDK Certified System Configurations, please refer to the [Oracle Java SE Certified System Configuration Pages](https://www.oracle.com/technetwork/java/javaseproducts/documentation/index.html#sysconfig).
diff --git a/OracleOpenJDK/14/Dockerfile b/OracleOpenJDK/14/Dockerfile
@@ -17,7 +17,7 @@
 # Run:
 #      $ docker build -t oracle/openjdk:14 .
 #
-# This command is already scripted on build.sh so you can alternatively run
+# This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
 #
 

diff --git a/OracleOpenJDK/15/Dockerfile b/OracleOpenJDK/15/Dockerfile
@@ -17,7 +17,7 @@
 # Run:
 #      $ docker build -t oracle/openjdk:15 .
 #
-# This command is already scripted on build.sh so you can alternatively run
+# This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
 #
 

diff --git a/OracleOpenJDK/README.md b/OracleOpenJDK/README.md
@@ -1,17 +1,23 @@
-Oracle Java OpenJDK
+Oracle Java OpenJDK on Docker
 =====
-This repository contains a sample Docker configuration to facilitate installation and environment setup for DevOps users. This project includes a Dockerfile for Oracle OpenJDK 14 based on Oracle Linux.
+This repository contains sample Docker configurations to facilitate installation and environment setup for DevOps users. This project includes Dockerfiles for Oracle OpenJDK based on Oracle Linux.
 
-## Building the Java 14 (OpenJDK) base image
+## Building the Oracle Java OpenJDK base image
+Navigate to the folder containing the Dockerfile and run docker build, tagging the image with the version number:
 
-Build it using:
+e.g. for OpenJDK 15 run
+```
+$ cd ../OracleOpenJDK/15
+$ docker build -t oracle/openjdk:15 .
+```
 
+This command is already scripted in build.sh so you can alternatively run:
 ```
-$ cd ../OracleOpenJDK/14
-$ docker build -t oracle/openjdk:14 .
+$ bash build.sh
 ```
 
 ## License
 The OpenJDK compressed archive used by this Dockerfile is available under the [GNU General Public License, version2, with the Classpath Exception](https://openjdk.java.net/legal/gplv2+ce.html), from the [Oracle OpenJDK website](https://jdk.java.net).
+Oracle Linux is licensed under the [Oracle Linux End-User License Agreement](https://oss.oracle.com/ol/EULA).
 
 All scripts and files hosted in this project and GitHub [`docker/OracleOpenJDK`](./) repository, required to build the Docker images are, unless otherwise noted, released under the [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.