Wcp 31689 :- Updating the Documentation with the detailed process of cloning or downloading the script (#2018)

Signed-off-by: Anand Sirasagi <[email protected]>

Author: anandsirasagi

OracleWebCenterPortal/dockerfiles/12.2.1.4/README.md

@@ -53,32 +53,33 @@ Create an environment file `webcenter.env.list` file, to define the parameters.
 Update the parameters inside `webcenter.env.list` as per your local setup.
 
 ```
-#Database Configuration
+# Database Configuration details
 DB_DROP_AND_CREATE=<true or false>
 DB_CONNECTION_STRING=<Hostname/ContainerName>:<Database Port>/<DB_PDB>.<DB_DOMAIN>
 DB_RCUPREFIX=<RCU Prefix>
 DB_PASSWORD=<Database Password>
 DB_SCHEMA_PASSWORD=<Schema Password>
 
-#configure container
+# Admin Server Configuration details
 ADMIN_SERVER_CONTAINER_NAME=<Admin Server Container Name>
 ADMIN_PORT=<Admin Server Port>
 ADMIN_PASSWORD=<Admin Server Password>
 ADMIN_USERNAME=<Admin Server User Name>
 MANAGED_SERVER_PORT=<Managed Server Port>
 
-# Configure Content Server
+# Content Server Connection Configuration details
 CONFIGURE_UCM_CONNECTION=<true or false>
-#Valid option for socket type are socket,jaxws 
+# Valid option for connection type are socket,jaxws 
 UCM_SOCKET_TYPE=<UCM Socket Type >
-#Required if UCM_SOCKET_TYPE is jaxws
+# Set to true if UCM is using SSL or else false
+UCM_USING_SSL=<true or false>
 UCM_HOST=<UCM Host>
 UCM_PORT=<UCM Port>
 UCM_ADMIN_USER=<UCM Admin User>
 UCM_INTRADOC_SERVER_PORT=<required if socket>
 UCM_CLIENT_SECURITY_POLICY=<required if jaxws>
 
-# Configure Elasticsearch Server
+# Elasticsearch Server Configuration details
 SEARCH_APP_USERNAME=<Search User Name>
 SEARCH_APP_USER_PASSWORD=<Search User Password>
 ```

OracleWebCenterPortal/dockerfiles/12.2.1.4/container-scripts/createContentServerConnection.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c)  2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c)  2020,2021, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 import sys
 
@@ -22,6 +22,7 @@
 ucmsocketType    = os.environ.get("UCM_SOCKET_TYPE")
 ucmIntraDocServerPort = os.environ.get("UCM_INTRADOC_SERVER_PORT")
 ucmClientSecurityPolicy = os.environ.get("UCM_CLIENT_SECURITY_POLICY")
+ucmUsingSSL = os.environ.get("UCM_USING_SSL")
 
 print('')
 print('Configuring Content Server Connection');
@@ -40,7 +41,11 @@
 print('')
 print('')
 
-ucmUrl= "http://" +  ucmHost + ":" + ucmPort + "/" + "idcnativews"
+if (ucmUsingSSL == 'true'):
+    ucmUrl = "https://" + ucmHost + ":" + ucmPort + "/" + "idcnativews"
+else:
+    ucmUrl = "http://" + ucmHost + ":" + ucmPort + "/" + "idcnativews"
+
 url = adminHost + ":" + adminPort
 connect(adminName, adminPassword, url)
 

OracleWebCenterPortal/dockerfiles/12.2.1.4/container-scripts/installElasticsearchAndStart.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020,2021 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 function validate_parameter {
@@ -21,8 +21,8 @@ fi
 
 if [ -z ${CONFIGURE_ES_CONNECTION} ]
 then
-   # by default we always keep this flag OFF
-   export CONFIGURE_ES_CONNECTION="false"
+   # by default we always keep this flag ON
+   export CONFIGURE_ES_CONNECTION="true"
 fi
 
 # validate admin server parameters

OracleWebCenterPortal/dockerfiles/README.md

@@ -45,18 +45,18 @@ $ docker tag container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.
 The Oracle Database image can be pulled from the  [Oracle Container Registry](https://container-registry.oracle.com) or you can build your own using the Dockerfiles and scripts from the [Oracle Database section of this repo](https://github.com/oracle/docker-images/tree/master/OracleDatabase).
 
 # 4. Building Oracle WebCenter Portal Images
-IMPORTANT: To build the Oracle WebCenter Portal image, you must first download the required version of the Oracle WebCenter Portal  binaries these install binaries are required to create the Oracle WebCenter Portal image. These binaries must be downloaded and copied into the folder with the same version for e.g. 12.2.1.4.0 binaries need to be dropped into `../OracleWebCenterPortal/dockerfiles/12.2.1.4`. 
+1. Clone or download the [Github repository](https://github.com/oracle/docker-images).The repository contains Docker files and scripts to build Docker images for Oracle products.
 
-The binaries can be downloaded from the [Here](https://www.oracle.com/middleware/technologies/webcenter-portal-download.html#).
+2. Download Oracle WebCenter Portal 12.2.1.4 binary from [Oracle Technology Network](https://www.oracle.com/middleware/technologies/webcenter-portal-download.html#).  
 
-Extract the downloaded zip files and copy `fmw_12.2.1.4.0_wcportal.jar` files under `dockerfiles/12.2.1.4` for building Oracle WebCenter Portal 12.2.1.4 image.
+3. Save the Oracle WebCenter Portal 12.2.1.4 binary into the cloned repository folder located at $DIR/docker-images/OracleWebCenterPortal/dockerfiles/12.2.1.4/ and extract the downloaded zip.
 
-To build Oracle WebCenter Portal Docker image, go to folder located at OracleWebCenterPortal/dockerfiles/ and run the following command:
-- Use the resulting image name to create containers 
+To build Oracle WebCenter Portal Docker image, go to folder located at $DIR/docker-images/OracleWebCenterPortal/dockerfiles/ and run the following command:
 
 ```
 $ sh buildDockerImage.sh -v 12.2.1.4
 ```
+- Use the resulting image name to create containers 
 
 
 **IMPORTANT**: The resulting image has automated scripts to: