Merge branch 'oracle:main' into main

Author: aditya059

CODEOWNERS

@@ -9,7 +9,7 @@
 /OracleAccessManagement/   @manjunathdhegde-2910
 /OracleBI/                 @sjvp
 /OracleCoherence/          @thegridman
-/OracleDatabase/           @gvenzl
+/OracleDatabase/           @yunus-qureshi
 /OracleDatabase/RAC/       @psaini79
 /OracleFMWInfrastructure/  @mriccell
 /OracleGoldenGate/         @masubram @sahudebasish
@@ -24,7 +24,6 @@
 /OracleUnifiedDirectory/   @kuldeepbshah
 /OracleUnifiedDirectorySM/ @kuldeepbshah
 /OracleVeridata/           @arnabnandioracle
-/OracleWebCenterContent/   @deboghos @pjadam
-/OracleWebCenterPortal/    @dgothe
+/OracleWebCenterContent/   @deboghos
 /OracleWebLogic/           @mriccell
-/OracleManagementAgent/    @drupanchal @ChaitanyaKulkarni28 @niravg75
+/OracleManagementAgent/    @drupanchal @niravg75

OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe

@@ -50,7 +50,8 @@ ENV ORACLE_BASE=/u01/app/oracle \
     CONFIG_RSP="xe.rsp" \
     RUN_FILE="runOracle.sh" \
     PWD_FILE="setPassword.sh" \
-    CHECK_DB_FILE="checkDBStatus.sh"
+    CHECK_DB_FILE="checkDBStatus.sh" \
+    DB_STARTED_MARKER_FILE="/dev/shm/.db_started"
 
 # Use second ENV so that variable get substituted
 ENV PATH=$ORACLE_HOME/bin:$PATH
@@ -89,4 +90,4 @@ RUN yum -y install unzip libaio bc initscripts net-tools openssl compat-libstdc+
 HEALTHCHECK --interval=1m --start-period=5m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
-CMD exec $ORACLE_BASE/$RUN_FILE
+CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/checkDBStatus.sh

@@ -12,7 +12,13 @@
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
 
+if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]; then
+   echo "Database was not started yet." >&2
+   exit 1
+fi
+
 POSITIVE_RETURN="OPEN"
+# shellcheck disable=SC2034
 ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
 
 # Check Oracle DB status and store it in status

OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/runOracle.sh

@@ -19,7 +19,11 @@ function runUserScripts {
 
     for f in $SCRIPTS_ROOT/*; do
         case "$f" in
-            *.sh)     echo "$0: running $f"; . "$f" ;;
+            *.sh)
+              echo "$0: running $f"
+              # shellcheck disable=SC1090
+              . "$f"
+              ;;
             *.sql)    echo "$0: running $f"; echo "exit" | su -p oracle -c "$ORACLE_HOME/bin/sqlplus / as sysdba @$f"; echo ;;
             *)        echo "$0: ignoring $f" ;;
         esac
@@ -175,7 +179,7 @@ fi;
 /etc/init.d/oracle-xe start | grep -qc "Oracle Database 11g Express Edition is not configured"
 if [ "$?" == "0" ]; then
    # Check whether container has enough memory
-   if [ `df -Pk /dev/shm | tail -n 1 | awk '{print $2}'` -lt 1048576 ]; then
+   if [ "`df -Pk /dev/shm | tail -n 1 | awk '{print $2}'`" -lt 1048576 ]; then
       echo "Error: The container doesn't have enough memory allocated."
       echo "A database XE container needs at least 1 GB of shared memory (/dev/shm)."
       echo "You currently only have $((`df -Pk /dev/shm | tail -n 1 | awk '{print $2}'`/1024)) MB allocated to the container."
@@ -190,7 +194,7 @@ if [ "$?" == "0" ]; then
 fi;
 
 # Check whether database is up and running
-$ORACLE_BASE/$CHECK_DB_FILE
+IGNORE_DB_STARTED_MARKER=true $ORACLE_BASE/$CHECK_DB_FILE
 if [ $? -eq 0 ]; then
   echo "#########################"
   echo "DATABASE IS READY TO USE!"
@@ -199,6 +203,8 @@ if [ $? -eq 0 ]; then
   # Execute custom provided startup scripts
   runUserScripts $ORACLE_BASE/scripts/startup
 
+  # Create marker file for the health check
+  touch "$DB_STARTED_MARKER_FILE"
 else
   echo "#####################################"
   echo "########### E R R O R ###############"

OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee

@@ -52,6 +52,7 @@ ENV ORACLE_BASE=/opt/oracle \
     SETUP_LINUX_FILE="setupLinuxEnv.sh" \
     CHECK_SPACE_FILE="checkSpace.sh" \
     CHECK_DB_FILE="checkDBStatus.sh" \
+    DB_STARTED_MARKER_FILE="/dev/shm/.db_started" \
     USER_SCRIPTS_FILE="runUserScripts.sh" \
     INSTALL_DB_BINARIES_FILE="installDBBinaries.sh"
 
@@ -119,4 +120,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
 # Define default command to start Oracle Database. 
-CMD exec $ORACLE_BASE/$RUN_FILE
+CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2

@@ -52,6 +52,7 @@ ENV ORACLE_BASE=/opt/oracle \
     SETUP_LINUX_FILE="setupLinuxEnv.sh" \
     CHECK_SPACE_FILE="checkSpace.sh" \
     CHECK_DB_FILE="checkDBStatus.sh" \
+    DB_STARTED_MARKER_FILE="/dev/shm/.db_started" \
     USER_SCRIPTS_FILE="runUserScripts.sh" \
     INSTALL_DB_BINARIES_FILE="installDBBinaries.sh"
 
@@ -119,4 +120,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
 # Define default command to start Oracle Database. 
-CMD exec $ORACLE_BASE/$RUN_FILE
+CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/checkDBStatus.sh

@@ -12,9 +12,17 @@
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
 
+if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]; then
+   echo "Database was not started yet." >&2
+   exit 1
+fi
+
+# shellcheck disable=SC2034
 ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
 OPEN_MODE="READ WRITE"
+# shellcheck disable=SC2034
 ORAENV_ASK=NO
+# shellcheck disable=SC1090
 source oraenv
 
 # Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status

OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/runOracle.sh

@@ -178,7 +178,7 @@ else
 fi;
 
 # Check whether database is up and running
-$ORACLE_BASE/$CHECK_DB_FILE
+IGNORE_DB_STARTED_MARKER=true $ORACLE_BASE/$CHECK_DB_FILE
 if [ $? -eq 0 ]; then
   echo "#########################"
   echo "DATABASE IS READY TO USE!"
@@ -187,6 +187,8 @@ if [ $? -eq 0 ]; then
   # Execute custom provided startup scripts
   $ORACLE_BASE/$USER_SCRIPTS_FILE $ORACLE_BASE/scripts/startup
 
+  # Create marker file for the health check
+  touch "$DB_STARTED_MARKER_FILE"
 else
   echo "#####################################"
   echo "########### E R R O R ###############"

OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile

@@ -46,6 +46,7 @@ ENV ORACLE_BASE=/opt/oracle \
     RUN_FILE="runOracle.sh" \
     START_FILE="startDB.sh" \
     CREATE_DB_FILE="createDB.sh" \
+    DB_STARTED_MARKER_FILE="/dev/shm/.db_started" \
     SETUP_LINUX_FILE="setupLinuxEnv.sh" \
     CHECK_SPACE_FILE="checkSpace.sh" \
     CHECK_DB_FILE="checkDBStatus.sh" \
@@ -116,4 +117,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
 # Define default command to start Oracle Database. 
-CMD exec $ORACLE_BASE/$RUN_FILE
+CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/checkDBStatus.sh

@@ -12,9 +12,17 @@
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
 
+if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]; then
+   echo "Database was not started yet." >&2
+   exit 1
+fi
+
+# shellcheck disable=SC2034
 ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
 OPEN_MODE="READ WRITE"
+# shellcheck disable=SC2034
 ORAENV_ASK=NO
+# shellcheck disable=SC1090
 source oraenv
 
 # Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status