Add latest DNS changes (#2753)

docker compose completed with blockdevices
NFS tested with RAC on Docker with Docker Compose
NEW DNS all testing completed with Podman and Podman Compose

Author: s1saurabh

OracleDatabase/RAC/OracleConnectionManager/README.md

@@ -3,50 +3,74 @@ Sample container build files to facilitate installation, configuration, and envi
 
 ## How to build and run
 This project offers sample container images for:
-  * Oracle Database 21c Client (21.3) for Linux x86-64
-  * Oracle Database 19c Client (19.3) for Linux x86-64
-  * Oracle Database 18c Client (18.3) for Linux x86-64
-  * Oracle Database 12c Release 2 Client (12.2.0.1.0) for Linux x86-64
+* Oracle Database 21c Client (21.3) for Linux x86-64
+* Oracle Database 19c Client (19.3) for Linux x86-64
+* Oracle Database 18c Client (18.3) for Linux x86-64
+* Oracle Database 12c Release 2 Client (12.2.0.1.0) for Linux x86-64
 
 To assist in building the container images, you can use the [buildContainerImage.sh](dockerfiles/buildContainerImage.sh) script. See section **Create Oracle Connection Manager Image** for instructions and usage.
 
 **IMPORTANT:** Oracle Connection Manager binds to a single port on your host and proxies incoming connections to multiple running containers. It can also proxy connections for users to Oracle RAC Databases running on internal container networks.
 
+If you are on Podman Host, please ensure that you have the `podman-docker` package installed on your OL8 Podman host to run the command using the docker utility.
+```bash
+dnf install podman-docker -y
+```
+
 For complete Oracle Connection Manager setup, please go though following steps and execute them as per your enviornment:
 
 ### Create Oracle Connection Manager Image
-**IMPORTANT:** You will have to provide the installation binaries of Oracle ADMIN Client Oracle Database 21c Client (21.3) for Linux x86-64 and put them into the `dockerfiles/<version>` folder. You  only need to provide the binaries for the edition you are going to install. The binaries can be downloaded from the [Oracle Technology Network](http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html). You also have to make sure to have internet connectivity for yum. Note that you must not uncompress the binaries.
+**IMPORTANT:** You will have to provide the installation binaries of Oracle ADMIN Client Oracle Database 21c Client (21.3) for Linux x86-64 and put them into the `dockerfiles/<version>` folder. You  only need to provide the binaries for the edition you are going to install.
 
-The `buildContainerImage.sh` script is just a utility shell script that performs MD5 checks and is an easy way for beginners to get started. Expert users are welcome to directly call `docker build` with their prefered set of parameters.Before you build the image make sure that you have provided the installation binaries and put them into the right folder. Go into the **dockerfiles** folder and run the **buildContainerImage.sh** script as root or with sudo privileges:
+The binaries can be downloaded from the [Oracle Technology Network](http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html).
 
-```
+You also have to make sure to have internet connectivity for yum. Note that you must not uncompress the binaries.
+
+The `buildContainerImage.sh` script is just a utility shell script that performs MD5 checks and is an easy way for beginners to get started. Expert users are welcome to directly call `docker build` with their prefered set of parameters.
+
+Before you build the image make sure that you have provided the installation binaries and put them into the right folder. Go into the **dockerfiles** folder and run the **buildContainerImage.sh** script as root or with sudo privileges:
+
+```bash
+cd <git-cloned-path>/docker-images/OracleDatabase/RAC/OracleConnectionManager/dockerfiles
 ./buildContainerImage.sh -v (Software Version)
 ./buildContainerImage.sh -v 21.3.0
 ```
 For detailed usage of command, please execute following command:
-```
+```bash
+cd <git-cloned-path>/docker-images/OracleDatabase/RAC/OracleConnectionManager/dockerfiles
 ./buildContainerImage.sh -h
 ```
 
 ### Create Network Bridge
 Before creating container, create the bridge. If you are using same bridge with same network then you can use same IPs mentioned in **Create Containers** section.
 
-```
+```bash
 docker network create --driver=bridge --subnet=172.16.1.0/24 rac_pub1_nw
 ```
 
 **Note:** You can change subnet according to your environment.
+### Create Containers
 
-### Create Containers.
-Execute following command as root user to create connection manager container.
+Execute following command as root user to create connection manager container on `Docker Host`-
 
+```bash
+docker run -d --hostname racnodedc1-cman --dns-search=example.com \
+--network=rac_pub1_nw --ip=172.16.1.164 \
+-e DOMAIN=example.com -e PUBLIC_IP=172.16.1.164 \
+-e PUBLIC_HOSTNAME=racnodedc1-cman -e SCAN_NAME=racnodedc1-scan \
+-e SCAN_IP=172.16.1.230 --privileged=false \
+-p 1521:1521 --name racnodedc1-cman oracle/client-cman:21.3.0
 ```
-/usr/bin/docker run -d --hostname racnode-cman1 --dns-search=example.com \
---network=rac_pub1_nw --ip=172.16.1.15 \
--e DOMAIN=example.com -e PUBLIC_IP=172.16.1.15 \
--e PUBLIC_HOSTNAME=racnode-cman1 -e SCAN_NAME=racnode-scan \
--e SCAN_IP=172.16.1.70 --privileged=false \
--p 1521:1521 --name racnode-cman oracle/client-cman:21.3.0
+
+Execute following command as root user to create connection manager container on `Podman Host`-
+
+```bash
+docker run -d --hostname racnodepc1-cman --dns-search=example.com \
+--network=rac_pub1_nw --ip=172.16.1.166 \
+-e DOMAIN=example.com -e PUBLIC_IP=172.16.1.166 \
+-e PUBLIC_HOSTNAME=racnodepc1-cman -e SCAN_NAME=racnodepc1-scan \
+-e SCAN_IP=172.16.1.236 --privileged=false \
+-p 1521:1521 --name racnodepc1-cman oracle/client-cman:21.3.0
 ```
 
 In the above container, you can see that we are passing env variables using "-e". You need to change PUBLIC_IP, PUBLIC_HOSTNAME, SCAN_NAME, SCAN_IP according to your environment. Also, container will be binding to port 1521 on your docker host.
@@ -55,13 +79,19 @@ In the above container, you can see that we are passing env variables using "-e"
 
 To check the Cman container/services creation logs , please tail docker logs. It will take 2 minutes to create the Cman container service.
 
+Check logs in `Docker Host` -
+```bash
+docker logs racnodedc1-cman
 ```
-docker logs racnode-cman
+
+Check logs in `Podman Host` -
+```bash
+docker logs racnodepc1-cman
 ```
 
 You should see following when cman container setup is done:
 
-```
+```bash
 ###################################
 CONNECTION MANAGER IS READY TO USE!
 ###################################

OracleDatabase/RAC/OracleDNSServer/README.md

@@ -7,13 +7,17 @@ Sample container build files to facilitate installation, configuration, and envi
 ## How to build and run
 You need to make sure that you have at least 350MB of space available for the container to create the files for RAC DNS server.
 
-**IMPORTANT:** If you are behind a proxy, you need to set the `http_proxy or https_proxy` env variable based on your environment before building the image.
+**IMPORTANT:** If you are behind a proxy, you need to set the `http_proxy or https_proxy` env variable based on your environment before building the image. Please ensure that you have the `podman-docker` package installed on your OL8 Podman host to run the command using the docker utility.
+```bash
+dnf install podman-docker -y
+```
 
 The `buildContainerImage.sh` script can assist with building the images. See below for instructions and usage.
 
 The `buildContainerImage.sh` script is a utility shell script that performs MD5 checks and is an easy way to get started. Users can also use the docker build command to build an image with custom configuration parameters. To run the script, go into the `dockerfiles` folder and run the `buildContainerImage.sh` script:
 
 ```bash
+cd <git-cloned-path>/docker-images/OracleDatabase/RAC/OracleDNSServer/dockerfiles 
 ./buildContainerImage.sh-v <Software Version>
 ./buildContainerImage.sh -v latest
 ```
@@ -30,32 +34,50 @@ Before you create the DNS server container, ensure you have created the required
 
 ```bash
 docker network create --driver=bridge --subnet=172.16.1.0/24 rac_pub1_nw
+docker network create --driver=bridge --subnet=192.168.17.0/24 rac_priv1_nw
 ```
 **Note:** You can change the subnet according to your environment.
 
 ### Running RAC DNS server container
 Execute following command to create the container:
 
 ```bash
-docker run -d  --name racdns \
- --hostname rac-dns  \
- --dns-search="example.com" \
- --cap-add=SYS_ADMIN  \
- --network  rac_pub1_nw \
- --ip 172.16.1.25 \
- --sysctl net.ipv6.conf.all.disable_ipv6=1 \
- --env SETUP_DNS_CONFIG_FILES="setup_true" \
- --env DOMAIN_NAME="example.com" \
- --env RAC_NODE_NAME_PREFIX="racnode" \
+docker create --hostname racdns \
+  --dns-search=example.com \
+  --cap-add=AUDIT_WRITE \
+  -e DOMAIN_NAME="example.com" \
+  -e PRIVATE_DOMAIN_NAME="example-priv.com" \
+  -e WEBMIN_ENABLED=false \
+  -e RAC_NODE_NAME_PREFIXD="racnoded" \
+  -e RAC_NODE_NAME_PREFIXP="racnodep" \
+  -e SETUP_DNS_CONFIG_FILES="setup_true"  \
+  --privileged=false \
+  --name rac-dnsserver \
  oracle/rac-dnsserver:latest
 ```
+Connect networks to DNS container in DockerHost-
+```bash
+docker network disconnect bridge rac-dnsserver
+docker network connect rac_pub1_nw --ip 172.16.1.25 rac-dnsserver
+docker network connect rac_priv1_nw --ip 192.168.17.25 rac-dnsserver
+docker start rac-dnsserver
+```
 
+Connect networks to DNS container in PodmanHost-
+```bash
+podman network disconnect podman rac-dnsserver
+podman network connect rac_pub1_nw --ip 172.16.1.25 rac-dnsserver
+podman network connect rac_priv1_nw --ip 192.168.17.25 rac-dnsserver
+podman start rac-dnsserver
+```
 In the above example, we used **172.16.1.0/24** subnet for the DNS server. You can change the subnet values according to your environment.
 
+Also, `RAC_NODE_NAME_PREFIXD`, `RAC_NODE_NAME_PREFIXP`, and `PRIVATE_DOMAIN_NAME` are optional environment variables. You can utilize one depending on whether you are planning to use DNS Server on Docker or Podman Host and want to utilize the Private Network Domain respectively.
+
 To check the DNS server container/services creation logs, please tail the Docker logs. It may take up to 2 minutes for the racdns container to start completely.
 
 ```bash
-docker logs -f racdns
+docker logs -f rac-dnsserver
 ```
 
 you should see the following in docker logs output:

OracleDatabase/RAC/OracleDNSServer/dockerfiles/.buildContainerImage.sh.swp

@@ -6,9 +6,9 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2014,2021 Oracle and/or its affiliates.
+# Copyright (c) 2018-2024 Oracle and/or its affiliates.
 #
-
+# shellcheck disable=SC2154
 usage() {
   cat << EOF
 
@@ -17,7 +17,7 @@ It builds a container image for a DNS server
 
 Parameters:
    -v: version to build
-       Choose one of: $(for i in $(ls -d */); do echo -n "${i%%/}  "; done)
+       Choose one of: $(for i in */; do echo -n "${i%%/}  "; done)
    -o: passes on container build option
 
 LICENSE UPL 1.0
@@ -33,13 +33,15 @@ checksumPackages() {
   if hash md5sum 2>/dev/null; then
     echo "Checking if required packages are present and valid..."
     md5sum -c Checksum
-    if [ "$?" -ne 0 ]; then
-      echo "MD5 for required packages to build this image did not match!"
-      echo "Make sure to download missing files in folder $VERSION."
-      exit $?
+    md5_exit_code=$?
+
+    if [ "$md5_exit_code" -ne 0 ]; then
+        echo "MD5 for required packages to build this image did not match!"
+        echo "Make sure to download missing files in folder $VERSION."
+        exit "$md5_exit_code"
     fi
   else
-    echo "Ignored MD5 sum, 'md5sum' command not available.";
+    echo "Ignored MD5 sum, 'md5sum' command not available."
   fi
 }
 
@@ -53,29 +55,27 @@ fi
 
 # Parameters
 VERSION="latest"
-SKIPMD5=0
-DOCKEROPS=""
+DOCKEROPS=("${DOCKEROPS[@]}")
+PROXY_SETTINGS=("${PROXY_SETTINGS[@]}")
 
-while getopts "hiv:o:" optname; do
+while getopts "h:v:o:" optname; do
   case "$optname" in
     "h")
       usage
       ;;
-    "i")
-      SKIPMD5=1
-      ;;
     "v")
       VERSION="$OPTARG"
       ;;
     "o")
-      DOCKEROPS="$OPTARG"
+      DOCKEROPS=("$OPTARG")
       ;;
     "?")
-      usage;
-      exit 1;
+      usage
+      # shellcheck disable=SC2317
+      exit 1
       ;;
     *)
-    # Should not occur
+      # Should not occur
       echo "Unknown error while processing options inside buildDockerImage.sh"
       ;;
   esac
@@ -85,32 +85,32 @@ done
 IMAGE_NAME="oracle/rac-dnsserver:$VERSION"
 
 # Go into version folder
-cd $VERSION
+cd "$VERSION" || exit
+
 
 echo "=========================="
 echo "DOCKER info:"
 docker info
 echo "=========================="
 
 # Proxy settings
-PROXY_SETTINGS=""
-if [ "${http_proxy}" != "" ]; then
-  PROXY_SETTINGS="$PROXY_SETTINGS --build-arg http_proxy=${http_proxy}"
+if [ -n "${http_proxy-}" ]; then
+  PROXY_SETTINGS+=("--build-arg http_proxy=${http_proxy}")
 fi
 
-if [ "${https_proxy}" != "" ]; then
-  PROXY_SETTINGS="$PROXY_SETTINGS --build-arg https_proxy=${https_proxy}"
+if [ -n "${https_proxy-}" ]; then
+  PROXY_SETTINGS+=("--build-arg https_proxy=${https_proxy}")
 fi
 
-if [ "${ftp_proxy}" != "" ]; then
-  PROXY_SETTINGS="$PROXY_SETTINGS --build-arg ftp_proxy=${ftp_proxy}"
+if [ -n "${ftp_proxy-}" ]; then
+  PROXY_SETTINGS+=("--build-arg ftp_proxy=${ftp_proxy}")
 fi
 
-if [ "${no_proxy}" != "" ]; then
-  PROXY_SETTINGS="$PROXY_SETTINGS --build-arg no_proxy=${no_proxy}"
+if [ -n "${no_proxy-}" ]; then
+  PROXY_SETTINGS+=("--build-arg no_proxy=${no_proxy}")
 fi
-
-if [ "$PROXY_SETTINGS" != "" ]; then
+# shellcheck disable=SC2128
+if [ -n "$PROXY_SETTINGS" ]; then
   echo "Proxy settings were found and will be used during the build."
 fi
 
@@ -121,25 +121,19 @@ 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 . || {
-  echo "There was an error building the image."
-  exit 1
-}
-BUILD_END=$(date '+%s')
-BUILD_ELAPSED=`expr $BUILD_END - $BUILD_START`
-
-echo ""
-
-if [ $? -eq 0 ]; then
-cat << EOF
+if docker build --force-rm=true --no-cache=true "${DOCKEROPS[@]}" "${PROXY_SETTINGS[@]}"  -t "$IMAGE_NAME" -f Dockerfile .; then
+  BUILD_END=$(date '+%s')
+  BUILD_ELAPSED=$((BUILD_END - BUILD_START))
+  
+  cat << EOF
   Oracle Database Docker Image for Real Application Clusters (RAC) version $VERSION is ready to be extended: 
     
     --> $IMAGE_NAME
 
   Build completed in $BUILD_ELAPSED seconds.
   
 EOF
-
 else
-  echo "Oracle Database Real Application Clusters Docker Image was NOT successfully created. Check the output and correct any reported problems with the docker build operation."
-fi
+  echo "There was an error building the image."
+  exit 1
+fi