Merge branch 'latest21c' of github.com:s1saurabh/docker-images into latest21c

Author: s1saurabh

OracleHTTPServer/README.md

@@ -42,7 +42,7 @@ If you want to start the OHS container without specifying any configuration for
         "$ docker run -v `HOST PATH where the domain.properties file is`:/u01/oracle/bootdir -it --name ohs -p 7777:7777 oracle/ohs:12.2.1.4.0"
 
 If you want to start the OHS container with some pre-specified mod_weblogic configuration:
-1. Depending on your weblogic environment , create a **custom_mod_wl_ohs.conf** file by referring to container-scripts/mod_wl_ohs.conf.sample and section 2.4 @ [OHS 12c Documentation](http://docs.oracle.com/middleware/12214/webtier/develop-plugin/oracle.htm#PLGWL553)
+1. Depending on your weblogic environment , create a **custom_mod_wl_ohs.conf** file by referring to container-scripts/mod_wl_ohs.conf.sample and section 2.4 @ [OHS 12c Documentation](https://docs.oracle.com/en/middleware/fusion-middleware/web-tier/12.2.1.4/develop-plugin/oracle.html#GUID-A463B189-DF47-4932-8B96-FD4F5FEC8D56)
 
 2. Place the custom_mod_wl_ohs.conf file in a directory in the host say,"/scratch/DockerVolume/OHSVolume" and then mount this directory into the container at the location "/config".
    By doing so, the contents of host directory /scratch/DockerVolume/OHSVolume(and hence custom_mod_wl_ohs.conf) will become available in the container at the mount point.

OracleHTTPServer/dockerfiles/14.1.2.0.0/container-scripts/start-ohs.py

@@ -1,4 +1,5 @@
-# Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
+
+# Copyright (c) 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
@@ -24,7 +25,7 @@
         sys.exit("Error: Please set the environment variable ORACLE_HOME")
 except (KeyError), why:
     sys.exit("Error: Missing Environment Variables " + str(why))
-nmConnect(username=username,password=password,domainName=domain_name)
+nmConnect(username=username,password=password,domainName=domain_name,domainDir=domain_path,host='localhost',port=5556,nmType='ssl')
 nmServerStatus(serverName=ohs_comp_name,serverType='OHS')
 nmStart(serverName=ohs_comp_name,serverType='OHS')
 nmServerStatus(serverName=ohs_comp_name,serverType='OHS')

OracleHTTPServer/dockerfiles/14.1.2.0.0/container-scripts/stop-ohs.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
@@ -24,7 +24,7 @@
         sys.exit("Error: Please set the environment variable ORACLE_HOME")
 except (KeyError), why:
     sys.exit("Error: Missing Environment Variables " + str(why))
-nmConnect(username,password,domainName=domain_name)
+nmConnect(username,password,domainName=domain_name,domainDir=domain_path,host='localhost',port=5556, nmType='ssl')
 nmServerStatus(serverName=ohs_comp_name,serverType='OHS')
 nmKill(serverName=ohs_comp_name,serverType='OHS')
 nmServerStatus(serverName=ohs_comp_name,serverType='OHS')

OracleIdentityGovernance/samples/scripts/agentAutoUpdate.sh

@@ -27,6 +27,12 @@ wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/JcqrvD9KJiJKJd_2o6LoHh
 
 #Get Agent Package
 agentVersion=$(unzip -q -c  "$1"/data/agent/agent-lcm/idm-agcs-agent-lcm.jar META-INF/MANIFEST.MF | grep "Agent-Version: " | awk '{print $2}' | tr -d '\n' | tr -d '\r')
+
+# shellcheck disable=SC3028,SC3007
+r=$[ $RANDOM % 121 ]
+# shellcheck disable=SC3007
+sleep $[r]
+
 if [ -f "$1"/cacerts ]
  then
    java \
@@ -94,4 +100,4 @@ if [  "$?" = "0" ]
      fi
 fi
 
-rm -rf "$1"/newpackage
+rm -rf "$1"/newpackage