Added configuration to decide between PDB/non-PDB setup

Author: jgebal

12.1.0.2-small-no-pdb/Dockerfile

@@ -53,7 +53,9 @@ ENV ORACLE_BASE=/opt/oracle \
     CHECK_SPACE_FILE="checkSpace.sh" \
     INSTALL_DB_BINARIES_FILE="installDBBinaries.sh" \
     ORACLE_PWD="oracle" \
-    ORACLE_PDB="ORCLPDB1"
+    ORACLE_PDB="ORCLPDB1" \
+    ORACLE_SID="ORCLCDB" \
+    CREATE_PDB="false"
 
 # Use second ENV so that variable get substituted
 ENV INSTALL_DIR=$ORACLE_BASE/install \

12.1.0.2-small-no-pdb/cleanupDB.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
-ORACLE_SID=$1
-# Check whether ORACLE_SID is passed on
-if [ "$ORACLE_SID" == "" ]; then
-  ORACLE_SID=ORCL
-fi;
-export ORACLE_SID
+
 
 sqlplus / as sysdba << EOF
   exec dbms_lock.sleep(30);
@@ -71,3 +66,28 @@ EOF
 rm -f $ORACLE_BASE/oradata/$ORACLE_SID/redo01.log
 rm -f $ORACLE_BASE/oradata/$ORACLE_SID/redo02.log
 rm -f $ORACLE_BASE/oradata/$ORACLE_SID/redo03.log
+
+if [ "$CREATE_PDB" == "true" ]; then
+
+    sqlplus / as sysdba << EOF
+      --PDBSEED
+        ALTER PLUGGABLE DATABASE PDB\$SEED CLOSE;
+        ALTER PLUGGABLE DATABASE PDB\$SEED OPEN READ WRITE;
+
+        ALTER SESSION SET CONTAINER = PDB\$SEED;
+        --Initialize XDB in PDBSEED
+        CREATE TABLE TEMP_XDB_INIT(DUMMY XMLTYPE);
+        DROP TABLE TEMP_XDB_INIT;
+
+        EXEC EXECUTE IMMEDIATE :kill_sess_holding_rollback;
+        --minimize size of UNDO TS
+        CREATE UNDO TABLESPACE undotbs0 DATAFILE '$ORACLE_BASE/oradata/$ORACLE_SID/pdbseed/undotbs00.dbf' SIZE 1M AUTOEXTEND ON NEXT 1M;
+        ALTER SYSTEM SET UNDO_TABLESPACE=undotbs0;
+        DROP TABLESPACE undotbs1 INCLUDING CONTENTS AND DATAFILES;
+        --minimize size of TEMP
+        ALTER TABLESPACE temp SHRINK SPACE;
+
+      exit;
+EOF
+
+fi;

12.1.0.2-small-no-pdb/createDB.sh

@@ -5,20 +5,11 @@
 # 
 # Since: November, 2016
 # Author: gerald.venzl@oracle.com
-# Description: Creates an Oracle Database based on following parameters:
-#              $ORACLE_SID: The Oracle SID and CDB name
-#              $ORACLE_PDB: The PDB name
-# 
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
 
 
-# Check whether ORACLE_SID is passed on
-export ORACLE_SID=${1:-ORCL}
-
-# Check whether ORACLE_PDB is passed on
-export ORACLE_PDB=${2:-ORCLPDB1}
-
 # Auto generate ORACLE PWD
 #ORACLE_PWD="`openssl rand -base64 8`1"
 echo "ORACLE AUTO GENERATED PASSWORD FOR SYS, SYSTEM AND PDBAMIN: $ORACLE_PWD";
@@ -29,6 +20,7 @@ sed -i -e "s|###ORACLE_SID###|$ORACLE_SID|g" $ORACLE_BASE/dbca.rsp
 sed -i -e "s|###ORACLE_PDB###|$ORACLE_PDB|g" $ORACLE_BASE/dbca.rsp
 sed -i -e "s|###ORACLE_PWD###|$ORACLE_PWD|g" $ORACLE_BASE/dbca.rsp
 sed -i -e "s|###ORACLE_CHARACTERSET###|$ORACLE_CHARACTERSET|g" $ORACLE_BASE/dbca.rsp
+sed -i -e "s|###CREATE_PDB###|$CREATE_PDB|g" $ORACLE_BASE/dbca.rsp
 
 # Create network related config files (sqlnet.ora, tnsnames.ora, listener.ora)
 mkdir -p $ORACLE_HOME/network/admin

12.1.0.2-small-no-pdb/dbca.rsp.tmpl

@@ -105,7 +105,7 @@ SID = "###ORACLE_SID###"
 # Default value : false
 # Mandatory     : No
 #-----------------------------------------------------------------------------
-CREATEASCONTAINERDATABASE = "false"
+CREATEASCONTAINERDATABASE = "###CREATE_PDB###"
 
 #-----------------------------------------------------------------------------
 # Name          : NUMBEROFPDBS

12.1.0.2-small-no-pdb/runOracle.sh

@@ -106,28 +106,18 @@ trap _term SIGTERM
 # Set SIGKILL handler
 trap _kill SIGKILL
 
-# Default for ORACLE SID
-if [ "$ORACLE_SID" == "" ]; then
-   export ORACLE_SID=ORCL
-else
-  # Check whether SID is no longer than 12 bytes
-  # Github issue #246: Cannot start OracleDB image
-  if [ "${#ORACLE_SID}" -gt 12 ]; then
-     echo "Error: The ORACLE_SID must only be up to 12 characters long."
-     exit 1;
-  fi;
-  
-  # Check whether SID is alphanumeric
-  # Github issue #246: Cannot start OracleDB image
-  if [[ "$ORACLE_SID" =~ [^a-zA-Z0-9] ]]; then
-     echo "Error: The ORACLE_SID must be alphanumeric."
-     exit 1;
-   fi;
+# Check whether SID is no longer than 12 bytes
+# Github issue #246: Cannot start OracleDB image
+if [ "${#ORACLE_SID}" -gt 12 ]; then
+ echo "Error: The ORACLE_SID must only be up to 12 characters long."
+ exit 1;
 fi;
 
-# Default for ORACLE PDB
-if [ "$ORACLE_PDB" == "" ]; then
-   export ORACLE_PDB=ORCLPDB1
+# Check whether SID is alphanumeric
+# Github issue #246: Cannot start OracleDB image
+if [[ "$ORACLE_SID" =~ [^a-zA-Z0-9] ]]; then
+ echo "Error: The ORACLE_SID must be alphanumeric."
+ exit 1;
 fi;
 
 # Default for ORACLE CHARACTERSET
@@ -138,24 +128,20 @@ fi;
  # Start database
 $ORACLE_BASE/$START_FILE;
 
-## Check whether database already exists
-#if [ -d $PDB_BASE_DIR/$ORACLE_PDB ]; then
-#   symLinkFiles;
-#
-#   # Make sure audit file destination exists
-#   if [ ! -d $ORACLE_BASE/admin/$ORACLE_SID/adump ]; then
-#      mkdir -p $ORACLE_BASE/admin/$ORACLE_SID/adump
-#   fi;
-#
-#
-#
-#else
-#
-#   # Create database
-#   $ORACLE_BASE/$CREATE_PDB_FILE
-#
-#fi;
-
+if [ "$CREATE_PDB" == "true" ]; then
+  # Check whether database already exists
+  if [ -d $PDB_BASE_DIR/$ORACLE_PDB ]; then
+     symLinkFiles;
+
+     # Make sure audit file destination exists
+     if [ ! -d $ORACLE_BASE/admin/$ORACLE_SID/adump ]; then
+        mkdir -p $ORACLE_BASE/admin/$ORACLE_SID/adump
+     fi;
+  else
+     # Create database
+     $ORACLE_BASE/$CREATE_PDB_FILE
+  fi;
+fi;
 # Check whether database prepare was already executed
 if [ ! -f $ORACLE_BASE/oradata/$ORACLE_SID/redo03.log ]; then
    # Prepare database

README.md

@@ -33,4 +33,7 @@ In case of any issues you have two choices:
  - change the image build configuration yourself
 
 The image scrips are provided as they are, no support or reliability is offered. Use at your own risk.
-  
+
+For small images you have an option to choose between PDB (Multi-tenant database) or non-PDB - (Single-tenant) database.
+
+Edit the `Dockerfile` before build and set the flag: `CREATE_PDB="false"` or `CREATE_PDB="true"`