fix for compose with new secrets

Author: s1saurabh

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/setup_rac_host.sh

@@ -61,8 +61,6 @@ setup_nfs_variables() {
     export PRIVATE1_NETWORK_SUBNET="192.168.17.0/24"
     export PRIVATE2_NETWORK_NAME="rac_priv2_nw"
     export PRIVATE2_NETWORK_SUBNET="192.168.18.0/24"
-    export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-    export KEY_SECRET_FILE=/opt/.secrets/key.pem
     export DNS_PUBLIC_IP=10.0.20.25
     export DNS_PRIVATE1_IP=192.168.17.25
     export DNS_PRIVATE2_IP=192.168.18.25
@@ -172,8 +170,6 @@ setup_blockdevices_variables(){
     export RACNODE2_PUBLIC_IP=10.0.20.171
     export RACNODE2_CRS_PRIVATE_IP1=192.168.17.171
     export RACNODE2_CRS_PRIVATE_IP2=192.168.18.171
-    export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-    export KEY_SECRET_FILE=/opt/.secrets/key.pem
     export DNS_CONTAINER_NAME=rac-dnsserver
     export DNS_HOST_NAME=racdns
     export DNS_IMAGE_NAME="oracle/rac-dnsserver:latest"

OracleDatabase/RAC/OracleRealApplicationClusters/docs/developers/README.md

@@ -1,14 +1,14 @@
 # Oracle Real Application Clusters in Linux Containers for Developers
 
-Learn about container deployment options for Oracle Real Application Clusters (Oracle RAC) Release 21c (v26.0)
+Learn about container deployment options for Oracle Real Application Clusters (Oracle RAC) Release 21c (v21.3 or later)
 
 ## Overview of Running Oracle RAC in Containers
 
 Oracle Real Application Clusters (Oracle RAC) is an option for the award-winning Oracle Database Enterprise Edition. Oracle RAC is a cluster database with a shared cache architecture that overcomes the limitations of traditional shared-nothing and shared-disk approaches to provide highly scalable and available database solutions for all business applications.
 Oracle RAC uses Oracle Clusterware as a portable cluster software that allows clustering of independent servers so that they cooperate as a single system and Oracle Automatic Storage Management (Oracle ASM) to provide simplified storage management that is consistent across all servers and storage platforms.
 Oracle Clusterware and Oracle ASM are part of the Oracle Grid Infrastructure, which bundles both solutions in an easy-to-deploy software package. For more information on Oracle RAC Database 21c refer to the [Oracle Database documentation](http://docs.oracle.com/en/database/).
 
-This guide helps you install Oracle RAC on Containers on Host Machines as explained in detail below. With the current release, you prepare the host machine, build or use pre-built Oracle RAC Container Images v26.0, and setup Oracle RAC on Single or Multiple Host machines with Oracle ASM.
+This guide helps you install Oracle RAC on Containers on Host Machines as explained in detail below. With the current release, you prepare the host machine, build or use pre-built Oracle RAC Container Images v21.0, and setup Oracle RAC on Single or Multiple Host machines with Oracle ASM.
 In this installation guide, we use [Podman](https://docs.podman.io/en/v3.0/) to create Oracle RAC Containers and manage them.
 
 ## Using this Documentation
@@ -34,7 +34,7 @@ To create an Oracle RAC environment, follow these steps:
 ## Before you begin
 - Before proceeding further, the below prerequisites related to the Oracle RAC (Real Application Cluster) Podman host Environment need to be setup as a preparation steps for the Podman host machine for Oracle RAC Containers. For more details related to the preparation of the host machine, refer to [Preparation Steps for running Oracle RAC Database in containers](../../README.md#preparation-steps-for-running-oracle-rac-database-in-containers).
 We have pre-created script `setup_rac_host.sh` which will prepare the podman host with the following pre-requisites-
-  - Validate Host machine for supported Os version(OL >9.3), Kernel(>UEKR7), Memory(>32GB), Swap(>32GB), shm(>4GB) etc.
+  - Validate Host machine for supported Os version(OL >8.5 or later), Kernel(>UEKR7), Memory(>32GB), Swap(>32GB), shm(>4GB) etc.
   - Update /etc/sysctl.conf
   - Setup node directories for Slim Image
   - Setup chronyd service
@@ -53,7 +53,7 @@ We have pre-created script `setup_rac_host.sh` which will prepare the podman hos
   ```
 
 - To prepare podman host machine using a pre-created script, copy the file `setup_rac_host.sh` from [<GITHUB_REPO_CLONED_PATH>/docker-images/OracleDatabase/RAC/
-OracleRealApplicationClusters/containerfiles/setup_rac_host.sh](../containerfiles/setup_rac_host.sh) and execute below -
+OracleRealApplicationClusters/containerfiles/setup_rac_host.sh](../../containerfiles/setup_rac_host.sh) and execute below -
   ```bash
   ./setup_rac_host.sh -prepare-rac-env
   ```
@@ -70,8 +70,8 @@ Refer [this documentation](https://docs.oracle.com/en/operating-systems/oracle-l
 Example of pulling an Oracle RAC Image from the Oracle Container Registry:
 ```bash
 # For Oracle RAC Container Image-
-podman pull container-registry.oracle.com/database/rac_ru:21.16
-podman tag container-registry.oracle.com/database/rac_ru:21.16 localhost/oracle/database-rac:21c
+podman pull container-registry.oracle.com/database/rac_ru:latest
+podman tag container-registry.oracle.com/database/rac_ru:latest localhost/oracle/database-rac:21c
 ```
 
 **Notes**
@@ -83,7 +83,7 @@ podman tag container-registry.oracle.com/database/rac_ru:21.16 localhost/oracle/
   ```bash
   podman images
   localhost/oracle/client-cman                    21.3.0      7b095637d7b6  About a minute ago  2.08 GB
-  localhost/oracle/database-rac                   21c      dcda5cf71b23  12 hours ago        9.33 GB
+  localhost/oracle/database-rac                   21c         dcda5cf71b23  12 hours ago        9.33 GB
   localhost/oracle/rac-storage-server             latest      d233b08a8aed  12 hours ago        443 MB
   localhost/oracle/rac-dnsserver                  latest      7d2301d7ea53  13 hours ago        279 MB
   ```
@@ -108,7 +108,7 @@ If you have a preconfigured DNS server in your environment, then you can replace
 
 ## Deploy Oracle RAC 2 Node Environment with NFS Storage Container
 - Copy `podman-compose.yml` file from this [<GITHUB_REPO_CLONED_PATH>/docker-images/OracleDatabase/RAC/
-OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/nfsdevices/podman-compose.yml](../samples/rac-compose/racimage/withoutresponsefiles/nfsdevices/podman-compose.yml) in your working directory.
+OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/nfsdevices/podman-compose.yml](../../samples/rac-compose/racimage/withoutresponsefiles/nfsdevices/podman-compose.yml) in your working directory.
 - Execute the below command from your working directory to export the required environment variables required by the compose file in this quickstart-
   ```bash
   source ./setup_rac_host.sh -nfs-env
@@ -197,7 +197,7 @@ OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/
 ## Deploy Oracle RAC 2 Node Environment with BlockDevices
 
 - Copy `podman-compose.yml` file from [<GITHUB_REPO_CLONED_PATH>/docker-images/OracleDatabase/RAC/
-OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/blockdevices/podman-compose.yml](../samples/rac-compose/racimage/withoutresponsefiles/blockdevices/podman-compose.yml) in your working directory.
+OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/blockdevices/podman-compose.yml](../../samples/rac-compose/racimage/withoutresponsefiles/blockdevices/podman-compose.yml) in your working directory.
 - Execute the below command to export the required environment variables required by the compose file in this quickstart-
   ```bash
   source ./setup_rac_host.sh -blockdevices-env
@@ -267,7 +267,7 @@ You can validate if the environment is healthy by running the below command-
 ```bash
 podman ps -a
 
-58642afb20eb  localhost/oracle/rac-dnsserver:latest       /bin/sh -c exec $...  23 hours ago  Up 23 hours (healthy)              rac-dnsserver
+58642afb20eb  localhost/oracle/rac-dnsserver:latest       /bin/sh -c exec $...  23 hours ago  Up 23 hours (healthy)           rac-dnsserver
 a192f4e9092a  localhost/oracle/database-rac:21c                              10 hours ago  Up 10 hours (healthy)              racnodep1
 745679457df5  localhost/oracle/database-rac:21c                              10 hours ago  Up 10 hours (healthy)              racnodep2
 ```
@@ -287,7 +287,7 @@ Refer to [README](../CLEANUP.md) for instructions on how to cleanup an Oracle RA
 
 ## Support
 
-At the time of this release, Oracle RAC on Podman is supported for Oracle Linux 9.3 later. To see current Linux support certifications, refer [Oracle RAC on Podman Documentation](https://docs.oracle.com/en/database/oracle/oracle-database/21/install-and-upgrade.html)
+At the time of this release, Oracle RAC on Podman is supported for Oracle Linux 8.5 later. To see current Linux support certifications, refer [Oracle RAC on Podman Documentation](https://docs.oracle.com/en/database/oracle/oracle-database/21/install-and-upgrade.html)
 
 ## License
 
@@ -297,4 +297,4 @@ All scripts and files hosted in this repository that are required to build the c
 
 ## Copyright
 
-Copyright (c) 2014-2025 Oracle and/or its affiliates.
+Copyright (c) 2014-2025 Oracle and/or its affiliates.

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/README.md

@@ -75,8 +75,6 @@ export RACNODE2_HOST_NAME=racnodep2
 export RACNODE2_PUBLIC_IP=10.0.20.171
 export RACNODE2_CRS_PRIVATE_IP1=192.168.17.171
 export RACNODE2_CRS_PRIVATE_IP2=192.168.18.171
-export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-export KEY_SECRET_FILE=/opt/.secrets/key.pem
 export DNS_CONTAINER_NAME=rac-dnsserver
 export DNS_HOST_NAME=racdns
 export DNS_IMAGE_NAME="oracle/rac-dnsserver:latest"
@@ -205,8 +203,6 @@ export RACNODE2_HOST_NAME=racnodep2
 export RACNODE2_PUBLIC_IP=10.0.20.171
 export RACNODE2_CRS_PRIVATE_IP1=192.168.17.171
 export RACNODE2_CRS_PRIVATE_IP2=192.168.18.171
-export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-export KEY_SECRET_FILE=/opt/.secrets/key.pem
 export DNS_CONTAINER_NAME=rac-dnsserver
 export DNS_HOST_NAME=racdns
 export DNS_IMAGE_NAME="oracle/rac-dnsserver:latest"
@@ -348,8 +344,6 @@ export PRIVATE1_NETWORK_NAME="rac_priv1_nw"
 export PRIVATE1_NETWORK_SUBNET="192.168.17.0/24"
 export PRIVATE2_NETWORK_NAME="rac_priv2_nw"
 export PRIVATE2_NETWORK_SUBNET="192.168.18.0/24"
-export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-export KEY_SECRET_FILE=/opt/.secrets/key.pem
 export DNS_PUBLIC_IP=10.0.20.25
 export DNS_PRIVATE1_IP=192.168.17.25
 export DNS_PRIVATE2_IP=192.168.18.25
@@ -515,8 +509,6 @@ export PRIVATE1_NETWORK_NAME="rac_priv1_nw"
 export PRIVATE1_NETWORK_SUBNET="192.168.17.0/24"
 export PRIVATE2_NETWORK_NAME="rac_priv2_nw"
 export PRIVATE2_NETWORK_SUBNET="192.168.18.0/24"
-export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-export KEY_SECRET_FILE=/opt/.secrets/key.pem
 export DNS_PUBLIC_IP=10.0.20.25
 export DNS_PRIVATE1_IP=192.168.17.25
 export DNS_PRIVATE2_IP=192.168.18.25
@@ -668,8 +660,6 @@ export PRIVATE1_NETWORK_SUBNET="192.168.17.0/24"
 export PRIVATE2_NETWORK_NAME="rac_priv2_nw"
 export PRIVATE2_NETWORK_SUBNET="192.168.18.0/24"
 export DNS_PUBLIC_IP=10.0.20.25
-export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-export KEY_SECRET_FILE=/opt/.secrets/key.pem
 export DB_SERVICE=service:soepdb
 ```
 Bring up RAC Containers-
@@ -732,8 +722,6 @@ export PRIVATE1_NETWORK_SUBNET="192.168.17.0/24"
 export PRIVATE2_NETWORK_NAME="rac_priv2_nw"
 export PRIVATE2_NETWORK_SUBNET="192.168.18.0/24"
 export DNS_PUBLIC_IP=10.0.20.25
-export PWD_SECRET_FILE=/opt/.secrets/pwdfile.enc
-export KEY_SECRET_FILE=/opt/.secrets/key.pem
 export CMAN_CONTAINER_NAME=racnodepc1-cman
 export CMAN_HOST_NAME=racnodepc1-cman
 export CMAN_PUBLIC_IP=10.0.20.15

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/blockdevices/addition/podman-compose.yml

@@ -9,9 +9,9 @@ networks:
     external: true
 secrets:
   pwdsecret:
-    file: ${PWD_SECRET_FILE}
+    external: pwdsecret
   keysecret:
-    file: ${KEY_SECRET_FILE}
+    external: keysecret
 services:
   racnodep3:
     container_name: ${RACNODE3_CONTAINER_NAME}

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/blockdevices/podman-compose.yml

@@ -9,9 +9,9 @@ networks:
     external: true
 secrets:
   pwdsecret:
-    file: ${PWD_SECRET_FILE}
+    external: pwdsecret
   keysecret:
-    file: ${KEY_SECRET_FILE}
+    external: keysecret
 services:
   rac-dnsserver:
     container_name: ${DNS_CONTAINER_NAME}

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/nfsdevices/addition/podman-compose.yml

@@ -9,9 +9,9 @@ networks:
     external: true
 secrets:
   pwdsecret:
-    file: ${PWD_SECRET_FILE}
+    external: pwdsecret
   keysecret:
-    file: ${KEY_SECRET_FILE}
+    external: keysecret
 volumes:
   racstorage:
     external: true

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/withoutresponsefiles/nfsdevices/podman-compose.yml

@@ -9,9 +9,9 @@ networks:
     external: true
 secrets:
   pwdsecret:
-    file: ${PWD_SECRET_FILE}
+    external: pwdsecret
   keysecret:
-    file: ${KEY_SECRET_FILE}
+    external: keysecret
 volumes:
   racstorage:
     external: true

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/withresponsefiles/blockdevices/podman-compose.yml

@@ -9,9 +9,9 @@ networks:
     external: true
 secrets:
   pwdsecret:
-    file: ${PWD_SECRET_FILE}
+    external: pwdsecret
   keysecret:
-    file: ${KEY_SECRET_FILE}
+    external: keysecret
 services:
   rac-dnsserver:
     container_name: ${DNS_CONTAINER_NAME}

OracleDatabase/RAC/OracleRealApplicationClusters/samples/rac-compose/racimage/withresponsefiles/nfsdevices/podman-compose.yml

@@ -9,9 +9,9 @@ networks:
     external: true
 secrets:
   pwdsecret:
-    file: ${PWD_SECRET_FILE}
+    external: pwdsecret
   keysecret:
-    file: ${KEY_SECRET_FILE}
+    external: keysecret
 volumes:
   racstorage:
     external: true