pick latest on patch RAC container

Author: s1saurabh

OracleDatabase/RAC/OracleRealApplicationClusters/README.md

@@ -248,15 +248,16 @@ Refer to [README](./docs/CLEANUP.md) for instructions on how to connect to an Or
 
 ## Sample Container Files for Older Releases
 
-This project offers example container files for Oracle Grid Infrastructure and Oracle Real Application Clusters for dev and test:
+This project offers example container (Podman) files for Oracle Grid Infrastructure and Oracle Real Application Clusters for dev and test:
 
-* Oracle Database 18c Oracle Grid Infrastructure (18.3) for Linux x86-64
-* Oracle Database 18c (18.3) for Linux x86-64
-* Oracle Database 12c Release 2 Oracle Grid Infrastructure (12.2.0.1.0) for Linux x86-64
-* Oracle Database 12c Release 2 (12.2.0.1.0) Enterprise Edition for Linux x86-64
+* Oracle Database 21c Oracle Grid Infrastructure (21.3) for Linux x86-64
+* Oracle Database 21c (21.3) for Linux x86-64
+* Oracle Database 19c Oracle Grid Infrastructure (19.3) for Linux x86-64
+* Oracle Database 19c (19.3) for Linux x86-64
 
-To install older releases of Oracle RAC on Podman or Oracle RAC on Docker, refer to the [README.md](./docs/README_1.md)
+To install older releases of Oracle RAC on Docker, refer to the [README.md](./docs/README_1.md#section-4-oracle-rac-on-docker)
 
+**Note** For RAC on Podman, do not refer older release details. Refer this project instructions for latest on RAC on Podman.
 ## Support
 
 At the time of this release, Oracle RAC on Podman is supported for Oracle Linux 8.10 or later. To see the current Linux support certifications, refer to [Oracle RAC on Podman Documentation](https://docs.oracle.com/en/database/oracle/oracle-database/21/install-and-upgrade.html)

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

@@ -99,10 +99,18 @@ echo "Building image '$IMAGE_NAME' ..."
 
 # BUILD THE IMAGE (replace all environment variables)
 BUILD_START=$(date '+%s')
-docker build --force-rm=true --no-cache=true $DOCKEROPS $PROXY_SETTINGS -t $IMAGE_NAME -f Dockerfile . || {
+docker build --no-cache=true $DOCKEROPS $PROXY_SETTINGS -t env -f ContainerfileEnv .
+
+docker cp $(docker create --name env --rm env):/tmp/.env ./ 
+
+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 . || {
   echo "There was an error building the image."
   exit 1
 }
+docker rmi -f env
+
 BUILD_END=$(date '+%s')
 BUILD_ELAPSED=`expr $BUILD_END - $BUILD_START`
 

…ers/samples/applypatch/latest/Dockerfile …/samples/applypatch/latest/ContainerfileOracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/latest/Dockerfile renamed to OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/latest/Containerfile OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/latest/Dockerfile renamed to OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/latest/Containerfile

@@ -21,7 +21,6 @@ ARG RAC_SLIM_IMAGE=localhost/oracle/database-rac:19.3.0-slim
 
 # Pull base image
 # ---------------
-# hadolint ignore=DL3006
 FROM $BASE_RAC_IMAGE as builder
 
 # Argument to control removal of components not needed after db software installation
@@ -65,17 +64,40 @@ RUN chown -R grid:oinstall $PATCH_INSTALL_DIR/*.sh && \
 USER oracle
 
 RUN $PATCH_INSTALL_DIR/$DB_PATCH_FILE $PATCH_INSTALL_DIR
-# hadolint ignore=DL3002
+
 USER root
 
 RUN $PATCH_INSTALL_DIR/$FIXUP_PREQ_FILE  && \
     rm -rf /etc/oracle && \
     rm -rf $PATCH_INSTALL_DIR
 
 #####################
-# 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"
+
 RUN if [ -d "/u01" ]; then \
   rm -rf /u01 && \
   :; \
@@ -89,7 +111,9 @@ WORKDIR $WORKDIR
 
 HEALTHCHECK --interval=2m --start-period=30m \
    CMD "$SCRIPT_DIR/scripts/main.py --checkracinst=true" >/dev/null || exit 1
-
+#Fix SID detection
+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
+ENTRYPOINT /usr/bin/$INITSH

OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch/latest/ContainerfileEnv

@@ -0,0 +1,9 @@
+# Stage 1: Base Stage with Environment Variables
+ARG BASE_RAC_IMAGE=localhost/oracle/database-rac:19.3.0
+FROM $BASE_RAC_IMAGE
+
+# Write the environment variables to a .env file
+RUN echo "GRID_HOME=$GRID_HOME" >> /tmp/.env && \
+    echo "DB_HOME=$DB_HOME" >> /tmp/.env
+
+ENTRYPOINT ["/bin/bash"]