For Dockerfile based README, added a line to mention tag for base ima…

…ge. For Base Image from ORC based README, removed instructions to pull Java image. (oracle#1771)

OracleAccessManagement/dockerfiles/12.2.1.4.0/README-OCR-Base.md

@@ -9,21 +9,6 @@ The following prerequisites are necessary before building OAM images:
 
 * A working installation of Docker 18.03 or later
 
-## Pulling the Oracle JDK (Server JRE) base image
-You can pull the Oracle Server JRE 8 image from the [Oracle Container Registry](https://container-registry.oracle.com). When pulling the Server JRE 8 image, re-tag the image so that it works with the dependent Dockerfile which refer to the JRE 8 image through oracle/serverjre:8.
-
-**IMPORTANT**: Before you pull the image from the registry, please make sure to log-in through your browser with your SSO credentials and ACCEPT "Terms and Restrictions".
-
-1. Sign in to [Oracle Container Registry](https://container-registry.oracle.com). Click the **Sign in** link which is on the top-right of the Web page.
-2. Click **Java** and then click on **serverjre**.
-3. Click **Accept** to accept the license agreement.
-4. Use following commands to pull Oracle Fusion Middleware infrastructure base image from repository :
-
-        
-        $ docker login container-registry.oracle.com
-        $ docker pull container-registry.oracle.com/java/serverjre:8
-        $ docker tag container-registry.oracle.com/java/serverjre:8 oracle/serverjre:8
-
 ## Pulling Oracle FMW Infrastructure 12.2.1.4.x image
 You can pull Oracle FMW Infrastructure 12.2.1.4.x image from the [Oracle Container Registry](https://container-registry.oracle.com). When pulling the FMW Infrastructure 12.2.1.4.x image, re-tag the image so that it works with the dependent dockerfile which refer to the FMW Infrastructure 12.2.1.4.x image through oracle/fmw-infrastructure:12.2.1.4.0.
 

OracleAccessManagement/dockerfiles/12.2.1.4.0/README.md

@@ -17,6 +17,8 @@ Please refer to [README.md](../../../OracleJava/README.md) under `docker-images/
 
 Please refer to [README.md](../../../OracleFMWInfrastructure/README.md) under `docker-images/OracleFMWInfrastructure` for details on how to build Oracle Fusion Middleware Infrastructure image.
 
+OAM Dockerfile uses the 'oracle/fmw-infrastructure:12.2.1.4.0' tag to refer to the Oracle Fusion Middleware (FMW) Infrastructure image, hence you should use this tag for the same.
+
 ## Building a Container Image for Oracle Access Management
 
 ### Downloading the OAM Docker files

OracleIdentityGovernance/dockerfiles/12.2.1.4.0/README.md

@@ -29,13 +29,12 @@ Building your own OIG image involves the following steps:
 * Downloading the 12.2.1.4.0 Identity Management shiphome and Patches
 * Building the OIG image
 
-
 
 ### How to Build the Oracle SOA Image
 
 Please refer to [README.md](../../../OracleSOASuite/README.md) under `docker-images/OracleSOASuite` for details on how to build Oracle Java image.
 
-You should use the following tag for the Oracle SOA Image: `fmw-soa:12.2.1.4.0`
+OIG Dockerfile uses the `fmw-soa:12.2.1.4.0` tag for the Oracle SOA image, hence you should use this tag while referring to the Oracle SOA image.
 
 ### Downloading the OIG Docker files
 

OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/README-OCR-Base.md

@@ -93,5 +93,5 @@ To download and run Oracle Fusion Middleware products, regardless whether inside
 All scripts and files hosted in this project and GitHub [docker-images/OracleUnifiedDirectory](./) repository required to build the images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
 ## Copyright
-Copyright (c) 2020 Oracle and/or its affiliates.
+Copyright (c) 2020, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl

OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/README.md

@@ -41,6 +41,8 @@ Oracle Unified Directory image has been tested and is known to run on following
 
 Please refer to [README.md](../../../OracleJava/README.md) under `docker-images/OracleJava` for details on how to build Oracle Java image.
 
+Oracle Unified Directory Dockerfile uses the `oracle/serverjre:8` tag for the Oracle Java image, hence you should use this tag while referring to the Oracle Java image.
+
 # 4. Building Oracle Unified Directory image
 
 ## Clone and download Oracle Unified Directory scripts and binary file
@@ -80,5 +82,5 @@ To download and run Oracle Fusion Middleware products, regardless whether inside
 All scripts and files hosted in this project and GitHub [docker-images/OracleUnifiedDirectory](./) repository required to build the images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
 ## Copyright
-Copyright (c) 2020 Oracle and/or its affiliates.
+Copyright (c) 2020, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl

OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/README-OCR-Base.md

@@ -5,19 +5,18 @@ Building an Oracle Unified Directory Services Manager Image with Dockerfiles, Sc
 
 1. [Introduction](#1-introduction)
 2. [Hardware and Software Requirements](#2-hardware-and-software-requirements)
-3. [Pulling the Oracle JDK (Server JRE) base image](#3-pulling-the-oracle-jdk-server-jre-base-image)
-4. [Pulling Oracle FMW Infrastructure 12.2.1.4.x image](#4-pulling-oracle-fmw-infrastructure-12-2-1-4-x-image)
-5. [Building Oracle Unified Directory Service Manager image](#5-building-oracle-unified-directory-service-manager-image)
+3. [Pulling Oracle FMW Infrastructure 12.2.1.4.x image](#3-pulling-oracle-fmw-infrastructure-12-2-1-4-x-image)
+4. [Building Oracle Unified Directory Services Manager image](#4-building-oracle-unified-directory-services-manager-image)
 
 # 1. Introduction
-This project offers scripts to build an Oracle Unified Directory Service Manager image based on 12cPS4 (12.2.1.4.0) release. Use this image to facilitate installation, configuration, and environment setup for DevOps users. 
+This project offers scripts to build an Oracle Unified Directory Services Manager image based on 12cPS4 (12.2.1.4.0) release. Use this image to facilitate installation, configuration, and environment setup for DevOps users. 
 
-This image refers to binaries for Oracle Unified Directory Service Manager Release 12.2.1.4.0 and it has the capability to create a Fusion Middleware Infrastructure domain with the Oracle Unified Directory Service Manager application deployed in a container with Oracle Unified Directory Service Manager deployed which can be targeted for development and testing.
+This image refers to binaries for Oracle Unified Directory Services Manager Release 12.2.1.4.0 and it has the capability to create a Fusion Middleware Infrastructure domain with the Oracle Unified Directory Services Manager application deployed in a container with Oracle Unified Directory Services Manager deployed which can be targeted for development and testing.
 
 ***Image***: `oracle/oudsm:12.2.1.4.0`
 
 # 2. Hardware and Software Requirements
-Oracle Unified Directory Service Manager image has been tested and is known to run on following hardware and software:
+Oracle Unified Directory Services Manager image has been tested and is known to run on following hardware and software:
 
 ## 2.1 Hardware Requirements
 
@@ -33,22 +32,7 @@ Oracle Unified Directory Service Manager image has been tested and is known to r
 | OS    | Oracle Linux 7.3 or higher     | more /etc/oracle-release  |
 | Docker| Docker version 18.03 or higher | docker version            |
 
-# 3. Pulling the Oracle JDK (Server JRE) base image
-You can pull the Oracle Server JRE 8 image from the [Oracle Container Registry](https://container-registry.oracle.com). When pulling the Server JRE 8 image, re-tag the image so that it works with the dependent Dockerfile which refer to the JRE 8 image through oracle/serverjre:8.
-
-**IMPORTANT**: Before you pull the image from the registry, please make sure to log-in through your browser with your SSO credentials and ACCEPT "Terms and Restrictions".
-
-1. Sign in to [Oracle Container Registry](https://container-registry.oracle.com). Click the **Sign in** link which is on the top-right of the Web page.
-2. Click **Java** and then click on **serverjre**.
-3. Click **Accept** to accept the license agreement.
-4. Use following commands to pull Oracle Fusion Middleware infrastructure base image from repository :
-
-        
-        $ docker login container-registry.oracle.com
-        $ docker pull container-registry.oracle.com/java/serverjre:8
-        $ docker tag container-registry.oracle.com/java/serverjre:8 oracle/serverjre:8
-
-# 4. Pulling Oracle FMW Infrastructure 12.2.1.4.x image
+# 3. Pulling Oracle FMW Infrastructure 12.2.1.4.x image
 You can pull Oracle FMW Infrastructure 12.2.1.4.x image from the [Oracle Container Registry](https://container-registry.oracle.com). When pulling the FMW Infrastructure 12.2.1.4.x image, re-tag the image so that it works with the dependent dockerfile which refer to the FMW Infrastructure 12.2.1.4.x image through oracle/fmw-infrastructure:12.2.1.4.0.
 
 **IMPORTANT**: Before you pull the image from the registry, please make sure to log-in through your browser with your SSO credentials and ACCEPT "Terms and Restrictions". fmw-infrastructure images can be found under Middleware section.
@@ -63,21 +47,21 @@ You can pull Oracle FMW Infrastructure 12.2.1.4.x image from the [Oracle Contain
         $ docker pull container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4-191222
         $ docker tag container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4-191222 oracle/fmw-infrastructure:12.2.1.4.0
 
-# 5. Building Oracle Unified Directory Service Manager image
+# 4. Building Oracle Unified Directory Services Manager image
 
-## Clone and download Oracle Unified Directory Service Manager docker scripts and binary file
+## Clone and download Oracle Unified Directory Services Manager docker scripts and binary file
 
 1. Clone the [GitHub repository](https://github.com/oracle/docker-images).
 The repository contains dockerfiles and scripts to build images for Oracle products.
-2. You must download and save the Oracle Unified Directory Service Manager 12.2.1.4.0 binary into the cloned/downloaded repository folder at location : `OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/` (see **Checksum** for file name which is inside dockerfiles/12.2.1.4.0/oud.download).
+2. You must download and save the Oracle Unified Directory Services Manager 12.2.1.4.0 binary into the cloned/downloaded repository folder at location : `OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/` (see **Checksum** for file name which is inside dockerfiles/12.2.1.4.0/oud.download).
 
-## Build Oracle Unified Directory Service Manager image using cloned/downloaded docker-images repository
+## Build Oracle Unified Directory Services Manager image using cloned/downloaded docker-images repository
 
 To assist in building the image, you can use the [`buildDockerImage.sh`](dockerfiles/buildDockerImage.sh) script. See below for instructions and usage.
 
 The `buildDockerImage.sh` script is a utility shell script that takes the version of the image that needs to be built. Expert users are welcome to directly call `docker build` with their prefered set of parameters.
 
-**IMPORTANT**: If you are building the Oracle Unified Directory Service Manager image, you must first download the Oracle Unified Directory 12.2.1.4.0 binary (fmw_12.2.1.4.0_oud.jar) and locate it in the folder, `./dockerfiles/12.2.1.4.0`.
+**IMPORTANT**: If you are building the Oracle Unified Directory Services Manager image, you must first download the Oracle Unified Directory 12.2.1.4.0 binary (fmw_12.2.1.4.0_oud.jar) and locate it in the folder, `./dockerfiles/12.2.1.4.0`.
 
 **IMPORTANT**: To build the Oracle Unified Directory Services Manager image with patches, you need to download and drop the patch zip files (for e.g. p31400392_122140_Generic.zip) into the `patches/` folder under the version which is required, for e.g. for 12.2.1.4.0 the folder is `12.2.1.4/patches/`.  Similarly, `OPatch` patches can be kept in the `opatch_patch/` folder (for 12.2.1.4.0 the folder is `12.2.1.4/opatch_patch`). Then run the `buildDockerImage.sh` script:
 
@@ -87,7 +71,7 @@ Note: Copy the **fmw_12.2.1.4.0_oud.jar** under the directory "OracleUnifiedDire
 
         $ sh buildDockerImage.sh
         Usage: buildDockerImage.sh -v [version]
-        Builds a Docker Image for Oracle Unified Directory Service Manager
+        Builds a Docker Image for Oracle Unified Directory Services Manager
 
         Parameters:
            -v: version to build. Required.
@@ -103,5 +87,5 @@ To download and run Oracle Fusion Middleware products, regardless whether inside
 All scripts and files hosted in this project and GitHub [docker-images/OracleUnifiedDirectorySM](./) repository required to build the images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
 ## Copyright
-Copyright (c) 2020 Oracle and/or its affiliates.
+Copyright (c) 2020, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl

OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/README.md

@@ -7,17 +7,17 @@ Building an Oracle Unified Directory Services Manager Image with Dockerfiles and
 1. [Hardware and Software Requirements](#2-hardware-and-software-requirements)
 1. [How to build the Oracle Java image](#3-how-to-build-the-oracle-java-image)
 1. [How to Build the Oracle Fusion Middleware Infrastructure image](#4-how-to-build-the-oracle-fusion-middleware-infrastructure-image)
-1. [Building Oracle Unified Directory Service Manager image](#5-building-oracle-unified-directory-service-manager-image)
+1. [Building Oracle Unified Directory Services Manager image](#5-building-oracle-unified-directory-services-manager-image)
 
 # 1. Introduction
-This project offers scripts to build an Oracle Unified Directory Service Manager image based on 12cPS4 (12.2.1.4.0) release. Use this image to facilitate installation, configuration, and environment setup for DevOps users. 
+This project offers scripts to build an Oracle Unified Directory Services Manager image based on 12cPS4 (12.2.1.4.0) release. Use this image to facilitate installation, configuration, and environment setup for DevOps users. 
 
-This image refers to binaries for Oracle Unified Directory Service Manager Release 12.2.1.4.0 and it has the capability to create a Fusion Middleware Infrastructure domain with the Oracle Unified Directory Service Manager application deployed in a container with Oracle Unified Directory Service Manager deployed which can be targeted for development and testing.
+This image refers to binaries for Oracle Unified Directory Services Manager Release 12.2.1.4.0 and it has the capability to create a Fusion Middleware Infrastructure domain with the Oracle Unified Directory Services Manager application deployed in a container with Oracle Unified Directory Services Manager deployed which can be targeted for development and testing.
 
 ***Image***: `oracle/oudsm:12.2.1.4.0`
 
 # 2. Hardware and Software Requirements
-Oracle Unified Directory Service Manager image has been tested and is known to run on following hardware and software:
+Oracle Unified Directory Services Manager image has been tested and is known to run on following hardware and software:
 
 ## 2.1 Hardware Requirements
 
@@ -41,21 +41,23 @@ Please refer to [README.md](../../../OracleJava/README.md) under `docker-images/
 
 Please refer to [README.md](../../../OracleFMWInfrastructure/README.md) under `docker-images/OracleFMWInfrastructure` for details on how to build Oracle Fusion Middleware Infrastructure image.
 
-# 5. Building Oracle Unified Directory Service Manager image
+Oracle Unified Directory Services Manager Dockerfile uses the `oracle/fmw-infrastructure:12.2.1.4.0` tag to refer to Oracle Fusion Middleware Infrastructure image, hence you should use this tag for the same.
 
-## Clone and download Oracle Unified Directory Service Manager docker scripts and binary file
+# 5. Building Oracle Unified Directory Services Manager image
+
+## Clone and download Oracle Unified Directory Services Manager docker scripts and binary file
 
 1. Clone the [GitHub repository](https://github.com/oracle/docker-images).
 The repository contains dockerfiles and scripts to build images for Oracle products.
-2. You must download and save the Oracle Unified Directory Service Manager 12.2.1.4.0 binary into the cloned/downloaded repository folder at location : `OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/` (see **Checksum** for file name which is inside dockerfiles/12.2.1.4.0/oud.download).
+2. You must download and save the Oracle Unified Directory Services Manager 12.2.1.4.0 binary into the cloned/downloaded repository folder at location : `OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/` (see **Checksum** for file name which is inside dockerfiles/12.2.1.4.0/oud.download).
 
-## Build Oracle Unified Directory Service Manager image using cloned/downloaded docker-images repository
+## Build Oracle Unified Directory Services Manager image using cloned/downloaded docker-images repository
 
 To assist in building the image, you can use the [`buildDockerImage.sh`](dockerfiles/buildDockerImage.sh) script. See below for instructions and usage.
 
 The `buildDockerImage.sh` script is a utility shell script that takes the version of the image that needs to be built. Expert users are welcome to directly call `docker build` with their prefered set of parameters.
 
-**IMPORTANT**: If you are building the Oracle Unified Directory Service Manager image, you must first download the Oracle Unified Directory 12.2.1.4.0 binary (fmw_12.2.1.4.0_oud.jar) and locate it in the folder, `./dockerfiles/12.2.1.4.0`.
+**IMPORTANT**: If you are building the Oracle Unified Directory Services Manager image, you must first download the Oracle Unified Directory 12.2.1.4.0 binary (fmw_12.2.1.4.0_oud.jar) and locate it in the folder, `./dockerfiles/12.2.1.4.0`.
 
 **IMPORTANT**: To build the Oracle Unified Directory Services Manager image with patches, you need to download and drop the patch zip files (for e.g. p31400392_122140_Generic.zip) into the `patches/` folder under the version which is required, for e.g. for 12.2.1.4.0 the folder is `12.2.1.4/patches/`.  Similarly, `OPatch` patches can be kept in the `opatch_patch/` folder (for 12.2.1.4.0 the folder is `12.2.1.4/opatch_patch`). Then run the `buildDockerImage.sh` script:
 
@@ -65,7 +67,7 @@ Note: Copy the **fmw_12.2.1.4.0_oud.jar** under the directory "OracleUnifiedDire
 
         $ sh buildDockerImage.sh
         Usage: buildDockerImage.sh -v [version]
-        Builds a Docker Image for Oracle Unified Directory Service Manager
+        Builds a Docker Image for Oracle Unified Directory Services Manager
 
         Parameters:
            -v: version to build. Required.
@@ -81,5 +83,5 @@ To download and run Oracle Fusion Middleware products, regardless whether inside
 All scripts and files hosted in this project and GitHub [docker-images/OracleUnifiedDirectorySM](./) repository required to build the images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
 ## Copyright
-Copyright (c) 2020 Oracle and/or its affiliates.
+Copyright (c) 2020, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl