GA release

Dockerfile.11202

@@ -14,12 +14,12 @@
 #              Database configuration is as per default installation, except for the
 #              location of the fast_recovery_area and redo logs.
 #
-#    NORMAL:   Following functionalities have been removed:
+#    REGULAR:  Following functionalities have been removed:
 #              * gcc & make (needed for native PL/SQL execution, etc.)
 #              * APEX
 #
 #    SLIM:     Following functionalities have been removed:
-#              * Everything that has been removed in the NORMAL image, plus:
+#              * Everything that has been removed in the REGULAR image, plus:
 #              * Oracle Text
 #
 # Copyright 2021 Gerald Venzl

README.md

@@ -212,11 +212,11 @@ The execution order and implications are the same as with the [Initialization sc
 
 # Image flavors
 
-| Flavor | Extension | Description                                                                                 | Use cases                                                                                              |
-| -------| --------- | ------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------|
-| Slim   | `-slim`   | An image focussed on smallest possible image size instead of additional functionality.      | Wherever small images sizes are important but advanced functionality of Oracle Database is not needed. |
-| Normal | [None]    | A well-balanced image between image size and functionality. Recommended for most use cases. | Recommended for most use cases.                                                                        |
-| Full   | `-full`   | An image containing all functionality as provided by the Oracle Database installation.      | Best for extensions and/or customizations.                                                             |
+| Flavor  | Extension | Description                                                                                 | Use cases                                                                                              |
+| --------| --------- | ------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------|
+| Slim    | `-slim`   | An image focussed on smallest possible image size instead of additional functionality.      | Wherever small images sizes are important but advanced functionality of Oracle Database is not needed. |
+| Regular | [None]    | A well-balanced image between image size and functionality. Recommended for most use cases. | Recommended for most use cases.                                                                        |
+| Full    | `-full`   | An image containing all functionality as provided by the Oracle Database installation.      | Best for extensions and/or customizations.                                                             |
 
 ## Full image flavor
 
@@ -236,19 +236,24 @@ A couple of modifications have been performed to make the installation more suit
 * The `REDO` logs have been located into `$ORACLE_BASE/oradata/$ORACLE_SID/` (11gR2 image)
 * The fast recovery area has been removed (11gR2 images)
 
-## Normal image flavor
+## Regular image flavor
 
-The normal image has all customizations that the full image has.
+The regular image has all customizations that the full image has.
 Additionally, it also includes the following changes:
 
 ### Database components
 * Oracle APEX has been removed (you can download and install the latest and greatest from [apex.oracle.com](https://apex.oracle.com), 11gR2 image)
 * The `HR` schema and folder have been removed
+* The JDBC drivers have been removed (`$ORACLE_HOME/jdbc`, `$ORACLE_HOME/jlib`, `$ORACLE_HOME/ucp`)
+* The Oracle Database Assistants have been removed (`$ORACLE_HOME/assistants`)
+* The Oracle Database Migration Assistant for Unicode has been removed (`$ORACLE_HOME/dmu`)
+* The OPatch utility has been removed (`$ORACLE_HOME/OPatch`)
+* The QOpatch utility has been removed (`$ORACLE_HOME/QOpatch`)
 
 ### Operating system
 
 * The following Linux packages are not installed: `binutils`, `gcc`, `glibc`, `make` (11g R2)
-* The jdbc drivers have been removed (`$ORACLE_HOME/jdbc`, `$ORACLE_HOME/jlib`)
+
 
 ### Data files
 
@@ -266,3 +271,4 @@ Additionally, it also includes the following changes:
 * The `DEFAULT` profile has the following set:
   * `FAILED_LOGIN_ATTEMPTS=UNLIMITED`
   * `PASSWORD_LIFE_TIME=UNLIMITED`
+* The Intel Math kernel libraries have been removed

buildContainerImage.sh

@@ -23,7 +23,7 @@
 set -Eeuo pipefail
 
 VERSION="18.4.0"
-FLAVOR="NORMAL"
+FLAVOR="REGULAR"
 IMAGE_NAME="gvenzl/oracle-xe"
 SKIP_CHECKSUM="false"
 
@@ -35,7 +35,7 @@ Builds a container image for Oracle Database XE.
 
 Parameters:
    -f: creates a 'full' image
-   -n: creates a normal image (default)
+   -n: creates a regular image (default)
    -s: creates a 'slim' image
    -v: version of Oracle Database XE to build
        Choose one of: 11.2.0.2, 18.4.0
@@ -65,7 +65,7 @@ while getopts "hfnsv:io:" optname; do
       FLAVOR="FULL"
       ;;
     "n")
-      FLAVOR="NORMAL"
+      FLAVOR="REGULAR"
       ;;
     "s")
       FLAVOR="SLIM"
@@ -107,7 +107,7 @@ fi;
 
 IMAGE_NAME="${IMAGE_NAME}:${VERSION}"
 
-if [ "${FLAVOR}" != "NORMAL" ]; then
+if [ "${FLAVOR}" != "REGULAR" ]; then
   IMAGE_NAME="${IMAGE_NAME}-${FLAVOR,,}"
 fi;
 

container-entrypoint.sh

@@ -99,10 +99,14 @@ function setup_env_vars() {
 # Create dbconfig directory structure
 function create_dbconfig() {
 
-  if [ -f "${ORACLE_BASE}"/oradata/"${ORACLE_SID}".zip ]; then
+  if [ -f "${ORACLE_BASE}"/"${ORACLE_SID}".zip ]; then
      echo "CONTAINER: uncompressing database data files, please wait..."
-     unzip "${ORACLE_BASE}"/oradata/"${ORACLE_SID}".zip -d "${ORACLE_BASE}"/oradata/ 1> /dev/null
-     rm "${ORACLE_BASE}"/oradata/"${ORACLE_SID}".zip
+     EXTRACT_START_TMS=$(date '+%s')
+     unzip "${ORACLE_BASE}"/"${ORACLE_SID}".zip -d "${ORACLE_BASE}"/oradata/ 1> /dev/null
+     EXTRACT_END_TMS=$(date '+%s')
+     EXTRACT_DURATION=$(( EXTRACT_END_TMS - EXTRACT_START_TMS ))
+     echo "CONTAINER: done uncompressing database data files, duration: ${EXTRACT_DURATION} seconds."
+     rm "${ORACLE_BASE}"/"${ORACLE_SID}".zip
   fi;
 
   mkdir -p "${ORACLE_BASE}/oradata/dbconfig/${ORACLE_SID}"

install.11202.sh

@@ -24,19 +24,18 @@ set -Eeuo pipefail
 
 echo "BUILDER: started"
 
-# Build mode ("SLIM", "NORMAL", "FULL")
-BUILD_MODE=${1:-"NORMAL"}
+# Build mode ("SLIM", "REGULAR", "FULL")
+BUILD_MODE=${1:-"REGULAR"}
 
 echo "BUILDER: BUILD_MODE=${BUILD_MODE}"
 
 # Set data file sizes
 SYSTEM_SIZE=353
 SYSAUX_SIZE=610
-TEMP_SIZE=2
 UNDO_SIZE=155
 if [ "${BUILD_MODE}" == "FULL" ]; then
   REDO_SIZE=50
-elif [ "${BUILD_MODE}" == "NORMAL" ]; then
+elif [ "${BUILD_MODE}" == "REGULAR" ]; then
   REDO_SIZE=20
   USERS_SIZE=10
 elif [ "${BUILD_MODE}" == "SLIM" ]; then
@@ -117,6 +116,10 @@ echo "BUILDER: post config database steps"
 
 # Perform further Database setup operations
 su -p oracle -c "sqlplus -s / as sysdba" << EOF
+
+   -- Exit on any errors
+   WHENEVER SQLERROR EXIT SQL.SQLCODE
+
    -- Enable remote HTTP access
    EXEC DBMS_XDB.SETLISTENERLOCALACCESS(FALSE);
 
@@ -159,9 +162,12 @@ rm "${ORACLE_BASE}"/oradata/"${ORACLE_SID}"/redo04.log
 ###################################
 
 # If not building the FULL image, remove and shrink additional components
-if [ "${BUILD_MODE}" == "NORMAL" ] || [ "${BUILD_MODE}" == "SLIM" ]; then
+if [ "${BUILD_MODE}" == "REGULAR" ] || [ "${BUILD_MODE}" == "SLIM" ]; then
   su -p oracle -c "sqlplus -s / as sysdba" << EOF
 
+     -- Exit on any errors
+     WHENEVER SQLERROR EXIT SQL.SQLCODE
+
      -- Disable password profile checks
      ALTER PROFILE DEFAULT LIMIT FAILED_LOGIN_ATTEMPTS UNLIMITED PASSWORD_LIFE_TIME UNLIMITED;
 
@@ -181,8 +187,11 @@ EOF
   if [ "${BUILD_MODE}" == "SLIM" ]; then
     su -p oracle -c "sqlplus -s / as sysdba" << EOF
 
-    -- Remove XDB
-    SELECT '#TODO' FROM DUAL;
+       -- Exit on any errors
+       WHENEVER SQLERROR EXIT SQL.SQLCODE
+
+       -- Remove XDB
+       SELECT '#TODO' FROM DUAL;
 EOF
     # Spatial
     # Text
@@ -192,6 +201,9 @@ EOF
   # Shrink datafiles
   su -p oracle -c "sqlplus -s / as sysdba" << EOF
 
+     -- Exit on any errors
+     WHENEVER SQLERROR EXIT SQL.SQLCODE
+
      ---------------------------
      -- Shrink SYSAUX tablespace
      ---------------------------
@@ -225,7 +237,7 @@ EOF
      -- Shrink TEMP tablespace
      -------------------------
 
-     ALTER DATABASE TEMPFILE '${ORACLE_BASE}/oradata/${ORACLE_SID}/temp.dbf' RESIZE ${TEMP_SIZE}M;
+     ALTER TABLESPACE TEMP SHRINK SPACE;
      ALTER DATABASE TEMPFILE '${ORACLE_BASE}/oradata/${ORACLE_SID}/temp.dbf'
         AUTOEXTEND ON NEXT 10M MAXSIZE UNLIMITED;
 
@@ -260,6 +272,10 @@ echo "BUILDER: graceful database shutdown"
 
 # Shutdown database gracefully (listener is not yet running)
 su -p oracle -c "sqlplus -s / as sysdba" << EOF
+
+   -- Exit on any errors
+   WHENEVER SQLERROR EXIT SQL.SQLCODE
+
    -- Shutdown database gracefully
    shutdown immediate;
    exit;
@@ -272,6 +288,8 @@ EOF
 echo "BUILDER: compressing database data files"
 cd "${ORACLE_BASE}"/oradata
 zip -r "${ORACLE_SID}".zip "${ORACLE_SID}"
+chown oracle:dba "${ORACLE_SID}".zip
+mv "${ORACLE_SID}".zip "${ORACLE_BASE}"/
 rm  -r "${ORACLE_SID}"
 cd - 1> /dev/null
 
@@ -398,7 +416,7 @@ rm "${ORACLE_BASE}"/diag/tnslsnr/localhost/listener/metadata/*
 rm -r "${ORACLE_BASE}"/oradiag_oracle/*
 
 # Remove additional files for NOMRAL and SLIM builds
-if [ "${BUILD_MODE}" == "NORMAL" ] || [ "${BUILD_MODE}" == "SLIM" ]; then
+if [ "${BUILD_MODE}" == "REGULAR" ] || [ "${BUILD_MODE}" == "SLIM" ]; then
 
   # Remove APEX directory
   rm -r "${ORACLE_HOME}"/apex