WCP-32741:- Update build scripts to support Elasticsearch (#2440)

Author: anandsirasagi

OracleWebCenterPortal/dockerfiles/12.2.1.4/README.md

@@ -82,6 +82,9 @@ UCM_CLIENT_SECURITY_POLICY=<required if jaxws>
 # Elasticsearch Server Configuration details
 SEARCH_APP_USERNAME=<Search User Name>
 SEARCH_APP_USER_PASSWORD=<Search User Password>
+ELASTIC_SEARCH_INSTALLER_FILE_NAME=<Elasticsearch Installer File Name>
+ELASTIC_SEARCH_VERSION=<Elasticsearch Version>
+
 ```
 
 ### 1.2. Admin Container (WCPAdminContainer)
@@ -237,6 +240,18 @@ $ sudo chown 1000:1000 /scratch/wcpdocker/volumes/es
 
 #### B. Creating and Running Elasticsearch Container
 
+>Note: Starting with the April 2022 PSU release for Oracle WebCenter Portal, you are able to optionally add Elasticsearch registered to the WebCenter Portal container image. Before creating this image, you must first manually download the [Elasticsearch 7.17.x binaries](https://www.elastic.co/downloads/past-releases#elasticsearch) directly from Elasticsearch.
+
+Update the `ELASTIC_SEARCH_INSTALLER_FILE_NAME` variable with the correct filename and set the `ELASTIC_SEARCH_VERSION` variable to the version of Elasticsearch you downloaded.
+
+Copy the downloaded `elasticsearch-7.17.x-linux-x86_64.tar.gz` file to the location on the host used as the source for the `DATA_MOUNT` bind mount: 
+
+```
+$  cp elasticsearch-7.17.x-linux-x86_64.tar.gz /scratch/wcpdocker/volumes/wcpportal
+```
+
+Run the following command to create the Elasticsearch container:
+
 ```
 $ docker run -i -t --name <ES_CONTAINER_NAME> --network=<NETWORK_NAME> -p <HostFreePort>:9200 --volumes-from <WCP_CONTAINER_NAME> -v <ES_DATA_MOUNT>:/u01/esHome/esNode/data --env-file webcenter.env.list oracle/wcportal:12.2.1.4 configureOrStartElasticsearch.sh
 ```
@@ -379,4 +394,6 @@ $ docker run -i -t --name ESContainer --network=WCPortalNET -p 9200:9200 --volum
 ```
 
 # Copyright
- Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+ Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+ 
+ Elasticsearch is a registered trademark of Elasticsearch BV.

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

@@ -45,7 +45,7 @@
 #Set up Node Manager
 #==========================
 connect(admin_name, admin_pass, url)
-if not admin_name == "weblogic"
+if not admin_name == "weblogic":
     grantAppRole(appStripe="webcenter", appRoleName="s8bba98ff_4cbb_40b8_beee_296c916a23ed#-#Administrator", principalClass="weblogic.security.principal.WLSUserImpl", principalName=admin_name)
 nmEnroll(domain_path, nodemanager_path)
 disconnect()

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020,2021, Oracle and/or its affiliates.
+# Copyright (c) 2020,2022, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 function validate_parameter {
@@ -34,6 +34,8 @@ validate_parameter "ADMIN_PASSWORD" $ADMIN_PASSWORD
 # validate elasticsearch server parameters
 validate_parameter "SEARCH_APP_USERNAME" $SEARCH_APP_USERNAME
 validate_parameter "SEARCH_APP_USER_PASSWORD" $SEARCH_APP_USER_PASSWORD
+validate_parameter "ELASTIC_SEARCH_INSTALLER_FILE_NAME" $ELASTIC_SEARCH_INSTALLER_FILE_NAME
+validate_parameter "ELASTIC_SEARCH_VERSION" $ELASTIC_SEARCH_VERSION
 
 export ADMIN_SERVER_CONTAINER_NAME=$ADMIN_SERVER_CONTAINER_NAME
 export ADMIN_PORT=$ADMIN_PORT
@@ -50,6 +52,11 @@ export KEEP_CONTAINER_ALIVE=$KEEP_CONTAINER_ALIVE
 export UNICAST_HOST_LIST=$UNICAST_HOST_LIST
 export NODE_NAME=${NODE_NAME}
 export LOAD_BALANCER_IP=${LOAD_BALANCER_IP}
+export ELASTIC_SEARCH_INSTALLER_FILE_NAME=$ELASTIC_SEARCH_INSTALLER_FILE_NAME
+export ELASTIC_SEARCH_INSTALLER_LOCATION="/u01/oracle/user_projects/$ELASTIC_SEARCH_INSTALLER_FILE_NAME"
+export ELASTIC_SEARCH_VERSION=$ELASTIC_SEARCH_VERSION
+
+
 echo "Environment variables"
 echo "====================="
 echo ""
@@ -66,6 +73,8 @@ echo "KEEP_CONTAINER_ALIVE=${KEEP_CONTAINER_ALIVE}"
 echo "UNICAST_HOST_LIST=${UNICAST_HOST_LIST}"
 echo "NODE_NAME=${NODE_NAME}"
 echo "LOAD_BALANCER_IP=${LOAD_BALANCER_IP}"
+echo "ELASTIC_SEARCH_VERSION=${ELASTIC_SEARCH_VERSION}"
+echo "ELASTIC_SEARCH_INSTALLER_LOCATION=${ELASTIC_SEARCH_INSTALLER_LOCATION}"
 echo ""
 echo ""
 
@@ -95,6 +104,8 @@ else
   sed -i "s|ADMIN_SERVER_PORT=.*|ADMIN_SERVER_PORT=$ADMIN_PORT|" $ES_CONFIG_FILE
   sed -i "s|SEARCH_APP_USER=.*|SEARCH_APP_USER=$SEARCH_APP_USERNAME|" $ES_CONFIG_FILE
   sed -i "s|WCP_FMW_CONFIG_LOCATION=.*|WCP_FMW_CONFIG_LOCATION=$FMW_CONFIG_HOME|" $ES_CONFIG_FILE
+  sed -i "s|ELASTIC_SEARCH_INSTALLER_LOCATION=.*|ELASTIC_SEARCH_INSTALLER_LOCATION=$ELASTIC_SEARCH_INSTALLER_LOCATION|" $ES_CONFIG_FILE
+  sed -i "s|ELASTIC_SEARCH_VERSION=.*|ELASTIC_SEARCH_VERSION=$ELASTIC_SEARCH_VERSION|" $ES_CONFIG_FILE
   sed -i "s|ELASTIC_SEARCH_CLUSTER_NAME=.*|ELASTIC_SEARCH_CLUSTER_NAME=$ES_CLUSTER_NAME|" $ES_CONFIG_FILE
 
   # env variable to support kubernetes deployment
@@ -109,7 +120,7 @@ else
   $ORACLE_HOME/oracle_common/common/bin/wlst.sh -skipWLSModuleScanning "$ORACLE_HOME/container-scripts/createSearchApplicationUser.py"
 
   # install elasticsearch server
-  $ORACLE_HOME/oracle_common/common/bin/wlst.sh -skipWLSModuleScanning "$ES_INSTALL_FILE" "$ES_CONFIG_FILE" "$ADMIN_PASSWORD" "$SEARCH_APP_USER_PASSWORD"
+  $ORACLE_HOME/oracle_common/common/bin/wlst.sh -skipWLSModuleScanning "$ES_INSTALL_FILE" "$ES_CONFIG_FILE" "$ADMIN_PASSWORD" "$SEARCH_APP_USER_PASSWORD" "$SEARCH_APP_USER_PASSWORD"
 
   # create search connection, if configured
   if [ "$CONFIGURE_ES_CONNECTION" == "true" ]