Patchimprovement (#2924)

* patch improvement changes using base image

* patch improvement changes using base image

Author: s1saurabh

OracleDatabase/RAC/OracleRealApplicationClusters/README.md

@@ -22,6 +22,7 @@ To create an Oracle RAC environment, follow these steps:
   - [Getting Oracle RAC Database Container Images](#getting-oracle-rac-database-container-images)
     - [Building Oracle RAC Database Container Image](#building-oracle-rac-database-container-image)
     - [Building Oracle RAC Database Container Slim Image](#building-oracle-rac-database-container-slim-image)
+    - [Building Oracle RAC Database Container Base Image](#building-oracle-rac-database-container-base-image)
   - [Network Management](#network-management)
   - [Password Management](#password-management)
   - [Oracle RAC on Containers Deployment Scenarios](#oracle-rac-on-containers-deployment-scenarios)
@@ -137,6 +138,19 @@ Retag it as below as we are going to refer this image as `localhost/oracle/datab
 podman tag localhost/oracle/database-rac:21.3.0-slim localhost/oracle/database-rac:21c-slim
 ```
 
+### Building Oracle RAC Database Container Base Image
+In this document, an `Oracle RAC Database Container Base Image` refers to a container image that does not include installation of Oracle Grid Infrastructure and Oracle Database Software Binaries during the Oracle RAC Database Container Image creation. This image is extended to build patched image or extensions. To build an Oracle RAC Database Container Base Image run the following command:
+```bash
+./buildContainerImage.sh -v <Software Version> -i -b
+```
+Example: To build Oracle RAC Database Container Base Image for version 21.3.0, use the below command:
+```bash
+./buildContainerImage.sh -v 21.3.0 -i -b
+```
+To build an Oracle RAC Database Container Base Image, you need to use `-b`.
+
+To change the Base Image during building Oracle RAC Database Container Images, you must use `--build-arg  BASE_OL_IMAGE=oraclelinux:8`.
+
 **Notes**
 - Usage of `./buildContainerImage.sh`:
    ```text

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/Containerfile

@@ -25,7 +25,7 @@ ARG SLIMMING=false
 # Pull base image
 # ---------------
 # hadolint ignore=DL3006,DL3025
-FROM $BASE_OL_IMAGE AS base
+FROM $BASE_OL_IMAGE AS racbase
 ARG SLIMMING=false
 ARG VERSION
 # Labels
@@ -97,9 +97,10 @@ ENV SETUP_LINUX_FILE="setupLinuxEnv.sh" \
 # -------------------------------------------
 #############################################
 
-FROM base AS rac-image-slim-false
+FROM racbase AS rac-image-slim-false
 ARG SLIMMING
-ARG VERSION 
+ARG VERSION
+ENV CV_ASSUME_DISTID=OEL7.8
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------
 # Linux Env Variable
@@ -117,7 +118,7 @@ ENV  INSTALL_SCRIPTS=$INSTALL_DIR/install \
      DB_PATH=$DB_HOME/bin:$DB_HOME/OPatch/:$DB_HOME/perl/bin:/usr/sbin:/bin:/sbin \
      GRID_LD_LIBRARY_PATH=$GRID_HOME/lib:/usr/lib:/lib \
      DB_LD_LIBRARY_PATH=$DB_HOME/lib:/usr/lib:/lib
-ENV CV_ASSUME_DISTID=OEL7.8
+
 # Copy binaries
 # -------------
 # COPY Binaries
@@ -141,7 +142,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh  && \
 # Start new stage for slim image
 # -------------------------------------------
 #############################################
-FROM base AS rac-image-slim-true
+FROM racbase AS rac-image-slim-true
 ARG SLIMMING
 ARG VERSION
 ENV CV_ASSUME_DISTID=OEL7.8
@@ -255,4 +256,30 @@ HEALTHCHECK --interval=2m --start-period=30m \
 
 # Define default command to start Oracle Grid and RAC Database setup.
 # hadolint ignore=DL3025
-ENTRYPOINT /usr/bin/$INITSH
+ENTRYPOINT /usr/bin/$INITSH
+################################################################
+# --------------------------------------------------------------
+# Start new stage for base image required by patching/extensions
+# --------------------------------------------------------------
+################################################################
+FROM final AS base
+ARG VERSION
+# Environment variables required for this build (do NOT change)
+# -------------------------------------------------------------
+# Linux Env Variable
+ENV GRID_BASE=/u01/app/grid \
+    GRID_HOME=/u01/app/19c/grid \
+    DB_BASE=/u01/app/oracle \
+    DB_HOME=/u01/app/oracle/product/19c/dbhome_1 \
+    SLIMMING=false
+# Use second ENV so that variable get substituted
+# hadolint ignore=DL3044
+ENV  INSTALL_SCRIPTS=$INSTALL_DIR/install \
+     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+     SCRIPT_DIR=$INSTALL_DIR/startup \
+     RAC_SCRIPTS_DIR="scripts" \
+     GRID_PATH=$GRID_HOME/bin:$GRID_HOME/OPatch/:$GRID_HOME/perl/bin:/usr/sbin:/bin:/sbin  \
+     DB_PATH=$DB_HOME/bin:$DB_HOME/OPatch/:$DB_HOME/perl/bin:/usr/sbin:/bin:/sbin \
+     GRID_LD_LIBRARY_PATH=$GRID_HOME/lib:/usr/lib:/lib \
+     DB_LD_LIBRARY_PATH=$DB_HOME/lib:/usr/lib:/lib
+COPY $VERSION/$ADDNODE_RSP $VERSION/$GRID_INSTALL_RSP $VERSION/$DBCA_RSP $SCRIPT_DIR/

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/Containerfile

@@ -25,7 +25,7 @@ ARG SLIMMING=false
 # Pull base image
 # ---------------
 # hadolint ignore=DL3006,DL3025
-FROM $BASE_OL_IMAGE AS base
+FROM $BASE_OL_IMAGE AS racbase
 ARG SLIMMING=false
 ARG VERSION
 # Labels
@@ -97,7 +97,7 @@ ENV SETUP_LINUX_FILE="setupLinuxEnv.sh" \
 # -------------------------------------------
 #############################################
 
-FROM base AS rac-image-slim-false
+FROM racbase AS rac-image-slim-false
 ARG SLIMMING
 ARG VERSION
 # Environment variables required for this build (do NOT change)
@@ -124,7 +124,7 @@ ENV  INSTALL_SCRIPTS=$INSTALL_DIR/install \
 COPY $VERSION/$SETUP_LINUX_FILE $VERSION/$GRID_SETUP_FILE $VERSION/$DB_SETUP_FILE $VERSION/$CHECK_SPACE_FILE $VERSION/$FIXUP_PREQ_FILE $INSTALL_SCRIPTS/
 
 # Setup Scripts
-COPY $VERSION/$RUN_FILE $VERSION/$ADDNODE_RSP $VERSION/$SETUPSSH $VERSION/$GRID_INSTALL_RSP $VERSION/$DBCA_RSP $VERSION/$INITSH  $SCRIPT_DIR/
+COPY $VERSION/$RUN_FILE $VERSION/$ADDNODE_RSP $VERSION/$SETUPSSH $VERSION/$GRID_INSTALL_RSP $VERSION/$DBCA_RSP $VERSION/$INITSH $SCRIPT_DIR/
 
 COPY $RAC_SCRIPTS_DIR $SCRIPT_DIR/scripts
 # hadolint ignore=SC2086
@@ -141,7 +141,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh  && \
 # Start new stage for slim image
 # -------------------------------------------
 #############################################
-FROM base AS rac-image-slim-true
+FROM racbase AS rac-image-slim-true
 ARG SLIMMING
 ARG VERSION
 # Environment variables required for this build (do NOT change)
@@ -253,4 +253,29 @@ HEALTHCHECK --interval=2m --start-period=30m \
 
 # Define default command to start Oracle Grid and RAC Database setup.
 # hadolint ignore=DL3025
-ENTRYPOINT /usr/bin/$INITSH
+ENTRYPOINT /usr/bin/$INITSH
+################################################################
+# --------------------------------------------------------------
+# Start new stage for base image required by patching/extensions
+# --------------------------------------------------------------
+################################################################
+FROM final AS base
+ARG SLIMMING
+ARG VERSION
+# Environment variables required for this build (do NOT change)
+# -------------------------------------------------------------
+# Linux Env Variable
+ENV GRID_BASE=/u01/app/grid \
+    GRID_HOME=/u01/app/21c/grid \
+    DB_BASE=/u01/app/oracle \
+    DB_HOME=/u01/app/oracle/product/21c/dbhome_1
+# Use second ENV so that variable get substituted
+# hadolint ignore=DL3044
+ENV  INSTALL_SCRIPTS=$INSTALL_DIR/install \
+     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+     SCRIPT_DIR=$INSTALL_DIR/startup \
+     RAC_SCRIPTS_DIR="scripts" \
+     GRID_PATH=$GRID_HOME/bin:$GRID_HOME/OPatch/:$GRID_HOME/perl/bin:/usr/sbin:/bin:/sbin  \
+     DB_PATH=$DB_HOME/bin:$DB_HOME/OPatch/:$DB_HOME/perl/bin:/usr/sbin:/bin:/sbin \
+     GRID_LD_LIBRARY_PATH=$GRID_HOME/lib:/usr/lib:/lib \
+     DB_LD_LIBRARY_PATH=$DB_HOME/lib:/usr/lib:/lib

OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/README.md

@@ -1,7 +1,7 @@
 # Example of how to create an Oracle RAC Database Container Patched Image
 =============================================
 ## Pre-requisites
-After you build your base Oracle RAC image following the [README.md](../../../OracleRealApplicationClusters/README.md#building-oracle-rac-database-container-image), it is mandatory to create **Oracle RAC Slim image** following [README.md](../../../OracleRealApplicationClusters/README.md#building-oracle-rac-database-container-slim-image), then  you can create a patched version of it.
+After you build your base Oracle RAC image following the [README.md](../../../OracleRealApplicationClusters/README.md#building-oracle-rac-database-container-image), it is mandatory to create **Oracle RAC Base image** following [README.md](../../../OracleRealApplicationClusters/README.md#building-oracle-rac-database-container-base-image), then  you can create a patched version of it.
 To build a patched image, you must provide the patch zip file.
 
 **Notes:**
@@ -56,10 +56,10 @@ These directories are useful if you want to install multiple patches at once. Th
        -o: passes on container build option
        -p: patch label to be used for the tag
    ```
-* The following is an example of building a patched image using 21.3.0. Note that `BASE_RAC_IMAGE=oracle/database-rac:21.3.0` is set to 21.3.0. You must set BASE_RAC_IMAGE and RAC_SLIM_IMAGE based on your enviornment.
+* The following is an example of building a patched image using 21.3.0. Note that `localhost/oracle/database-rac:21.3.0-base` is created before using [README.md](../../../OracleRealApplicationClusters/README.md#building-oracle-rac-database-container-base-image).
 
  ```bash
- # ./buildPatchedContainerImage.sh -v 21.3.0 -p 21.16.0  -o '--build-arg BASE_RAC_IMAGE=localhost/oracle/database-rac:21.3.0 --build-arg RAC_SLIM_IMAGE=localhost/oracle/database-rac:21.3.0-slim'
+ ./buildPatchedContainerImage.sh -v 21.3.0 -p 21.16.0
  ```
 
 Logs-
@@ -70,7 +70,7 @@ Logs-
 
   Build completed in 1419 seconds.
 ```
-Once Oracle RAC Patch image is built, lets retag it and it is referenced as 21c in this [README](../../README.md) documenation.
+Once Oracle RAC Patch image is built, lets retag it and it is referenced as 21c in this [README](../../docs/rac-container/racimage/README.md) documentation.
 ```bash
 podman tag localhost/oracle/database-rac:21.3.0-21.16.0 localhost/oracle/database-rac:21c
 ```
@@ -81,4 +81,4 @@ podman tag localhost/oracle/database-rac:21.3.0-21.16.0 localhost/oracle/databas
 
 ## Copyright
 
-Copyright (c) 2014-2025 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014-2025 Oracle and/or its affiliates. All rights reserved.

OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/buildPatchedContainerImage.sh

@@ -37,7 +37,7 @@ ENTERPRISE=0
 STANDARD=0
 # shellcheck disable=SC2034
 LATEST="latest"
-VERSION='x'
+VERSION='19.3.0'
 PATCHLABEL="patch"
 DOCKEROPS=""
 
@@ -103,17 +103,13 @@ echo "Building image '$IMAGE_NAME' ..."
 
 # BUILD THE IMAGE (replace all environment variables)
 BUILD_START=$(date '+%s')
-docker build --no-cache=true $DOCKEROPS $PROXY_SETTINGS -t env -f ContainerfileEnv .
-# shellcheck disable=SC2046
-docker cp $(docker create --name env-070125 --rm env):/tmp/.env ./ 
 # shellcheck disable=SC2046
 docker build --no-cache=true $DOCKEROPS \
-             --build-arg GRID_HOME=$(grep GRID_HOME .env | cut -d '=' -f2) \
-             --build-arg DB_HOME=$(grep DB_HOME .env | cut -d '=' -f2) $PROXY_SETTINGS -t $IMAGE_NAME -f Containerfile . || {
+             --build-arg VERSION=$VERSION \
+             $PROXY_SETTINGS -t $IMAGE_NAME -f Containerfile . || {
   echo "There was an error building the image."
   exit 1
 }
-docker rmi -f env-070125
 
 BUILD_END=$(date '+%s')
 BUILD_ELAPSED=`expr $BUILD_END - $BUILD_START`
@@ -132,4 +128,4 @@ EOF
 
 else
   echo "Oracle Database Real Application Clusters container image was NOT successfully created. Check the output and correct any reported problems that occurred during the build operation."
-fi
+fi

OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/latest/Containerfile

@@ -1,6 +1,6 @@
 # LICENSE UPL 1.0
 #
-# Copyright (c) 1982-2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1982-2025 Oracle and/or its affiliates. All rights reserved.
 #
 # ORACLE DOCKERFILES PROJECT
 # --------------------------
@@ -16,13 +16,11 @@
 # Run: 
 #      $ docker build -f Dockerfile -t oracle/rac-database:21.3.0-<patch level> . 
 #
-ARG BASE_RAC_IMAGE=localhost/oracle/database-rac:19.3.0
-ARG RAC_SLIM_IMAGE=localhost/oracle/database-rac:19.3.0-slim
+ARG VERSION=19.3.0
 
 # Pull base image
 # ---------------
-# hadolint ignore=DL3006
-FROM $BASE_RAC_IMAGE as builder
+FROM localhost/oracle/database-rac:$VERSION as builder
 
 # Argument to control removal of components not needed after db software installation
 ARG SLIMMING=false
@@ -71,54 +69,31 @@ USER root
 
 RUN $PATCH_INSTALL_DIR/$FIXUP_PREQ_FILE  && \
     rm -rf /etc/oracle && \
-    rm -rf $PATCH_INSTALL_DIR
+    rm -rf $PATCH_INSTALL_DIR && \
+    rm -rf $PATCH_DIR/* $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage
 
 #####################
-# hadolint ignore=DL3006
-FROM $RAC_SLIM_IMAGE AS final
-
-# Define build-time arguments
-ARG GRID_HOME
-ARG DB_HOME
-
-#Set environment variables using build arguments
-ENV GRID_BASE=/u01/app/grid \
-    GRID_HOME=$GRID_HOME \
-    DB_BASE=/u01/app/oracle \
-    DB_HOME=$DB_HOME \
-    INSTALL_SCRIPTS=/opt/scripts/install \
-    SCRIPT_DIR=/opt/scripts/startup \
-    RAC_SCRIPTS_DIR="scripts"
-
-ENV GRID_PATH=$GRID_HOME/bin:$GRID_HOME/OPatch/:$GRID_HOME/perl/bin:/usr/sbin:/bin:/sbin \
-    DB_PATH=$DB_HOME/bin:$DB_HOME/OPatch/:$DB_HOME/perl/bin:/usr/sbin:/bin:/sbin \
-    GRID_LD_LIBRARY_PATH=$GRID_HOME/lib:/usr/lib:/lib \
-    DB_LD_LIBRARY_PATH=$DB_HOME/lib:/usr/lib:/lib
-
-# Run some basic command to verify the environment variables (optional)
-RUN echo "GRID_BASE=$GRID_BASE" && \
-    echo "GRID_HOME=$GRID_HOME" && \
-    echo "DB_BASE=$DB_BASE" && \
-    echo "DB_HOME=$DB_HOME"
+FROM localhost/oracle/database-rac:$VERSION-base AS final
 
 RUN if [ -d "/u01" ]; then \
   rm -rf /u01 && \
   :; \
 fi
 
 COPY --from=builder /u01 /u01
+#Fix SID detection
+# hadolint ignore=SC2086
+RUN $INVENTORY/orainstRoot.sh && \
+    $GRID_HOME/root.sh && \
+    $DB_HOME/root.sh && \
+    sync
 
 USER ${USER}
 VOLUME ["/common_scripts"]
 WORKDIR $WORKDIR
 
 HEALTHCHECK --interval=2m --start-period=30m \
    CMD "$SCRIPT_DIR/scripts/main.py --checkracinst=true" >/dev/null || exit 1
-#Fix SID detection
-# hadolint ignore=SC2086
-RUN $INVENTORY/orainstRoot.sh && \
-    $GRID_HOME/root.sh && \
-    $DB_HOME/root.sh
 # Define default command to start Oracle Grid and RAC Database setup.
 # hadolint ignore=DL3025
 ENTRYPOINT /usr/bin/$INITSH