Compose (#2751)

* compose file changes

* reorganised compose README files

* Lint fixes

* lint fixes

* Add Storage Server for Podman

* NFS compose file changes

* working patch image with podman NFS

* minor fix

* minor fixes

* lint fixes

* minor fixes

Author: s1saurabh

OracleDatabase/RAC/OracleRACStorageServer/README.md

@@ -1,9 +1,44 @@
 # Oracle ASM on NFS Server for RAC testing
-Sample Docker build files to facilitate installation, configuration, and environment setup for DevOps users.
+Sample Docker and Podman build files to facilitate installation, configuration, and environment setup for DevOps users.
 
 **IMPORTANT:** This image can be used to setup ASM on NFS for RAC. You can skip if you have physical block devices or NAS server for Oracle RAC and Grid. You need to make sure that NFS server container must be up and running for RAC functioning. This image is for only testing purpose.
 
-## How to build and run
+Refer below instructions for setup of NFS Container for RAC -
+
+- [Oracle ASM on NFS Server for RAC testing](#oracle-asm-on-nfs-server-for-rac-testing)
+- [How to build NFS Storage Container Image](#how-to-build-nfs-storage-container-image)
+  - [How to build NFS Storage Container Image on Podman Host](#how-to-build-nfs-storage-container-image-on-podman-host)
+  - [How to build NFS Storage Container Image on Docker Host](#how-to-build-nfs-storage-container-image-on-docker-host)
+- [Create Bridge Network](#create-bridge-network)
+- [NFS Server installation on Host](#nfs-server-installation-on-host)
+- [Running RACStorageServer container](#running-racstorageserver-container)
+  - [RAC Storage Container for Podman Host Machine](#rac-storage-container-for-podman-host-machine)
+  - [RAC Storage container for Docker Host Machine](#rac-storage-container-for-docker-host-machine)
+- [Create NFS Volume](#create-nfs-volume)
+- [Copyright](#copyright)
+
+## How to build NFS Storage Container Image
+### How to build NFS Storage Container Image on Podman Host
+
+You need to make sure that you have atleast 60GB space available for container to create the files for RAC storage.
+
+**IMPORTANT:** If you are behind the proxy, you need to set `http_proxy` and `https_proxy` env variable based on your enviornment before building the image.
+
+To assist in building the images, you can use the [buildDockerImage.sh](dockerfiles/buildDockerImage.sh) script. See below for instructions and usage.
+
+The `buildDockerImage.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. Go into the **dockerfiles** folder and run the **buildDockerImage.sh** script:
+
+```bash
+./buildDockerImage.sh -v latest
+```
+You would see successful build message similar like below-
+```bash
+ Oracle RAC Storage Server Podman Image version latest is ready to be extended: 
+    
+    --> oracle/rac-storage-server:latest
+```
+
+### How to build NFS Storage Container Image on Docker Host
 You need to make sure that you have atleast 60GB space available for container to create the files for RAC storage.
 
 **IMPORTANT:** If you are behind the proxy, you need to set http_proxy env variable based on your enviornment before building the image.
@@ -13,37 +48,90 @@ To assist in building the images, you can use the [buildDockerImage.sh](dockerfi
 The `buildDockerImage.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. Go into the **dockerfiles** folder and run the **buildDockerImage.sh** script:
 
 ```bash
-./buildDockerImage.sh -v (Software Version)
 ./buildDockerImage.sh -v 19.3.0
 ```
 
-**NOTE**: To build RACStorage Image for 18.3.0, pass the version 18.3.0 to buildDockerImage.sh
-
 For detailed usage of command, please execute folowing command:
 ```bash
 ./buildDockerImage.sh -h
 ```
 
-### Create Bridge
-Before creating container, create the bridge for NFS storage container.
+## Create Bridge Network
+Before creating container, create the bridge private network for NFS storage container.
 
+On Docker host-
 ```bash
 docker network create --driver=bridge --subnet=192.168.17.0/24 rac_priv1_nw
 ```
 
+On Podman host-
+```bash
+podman network create --driver=bridge --subnet=192.168.17.0/24 rac_priv1_nw
+```
+
 **Note:** You can change subnet according to your environment.
 
-### Disable SELINUX
-SELINUX must be disabled or in permissive mode.
 
-### NFS Server installation on Docker Host
-You must install NFS server rpms on docker host to utilize NFS volumes in containers.
+## NFS Server installation on Host
+You must install NFS server rpms on  host to utilize NFS volumes in containers.
 
 ```bash
 yum -y install nfs-utils
 ```
+## Running RACStorageServer container
+  
+### Running RACStorageServer Podman container
+
+#### Prerequisites for RAC Storage Container for Podman Host
+
+Create placeholder for NFS storage and make sure it is empty -
+```bash
+export ORACLE_DBNAME=ORCLCDB
+mkdir -p /scratch/stage/rac-storage/$ORACLE_DBNAME
+rm -rf /scratch/stage/rac-storage/ORCLCDB/asm_disk0*
+```
+
+#### RAC Storage Container for Podman Host Machine
+
+If you are building RAC storage container using Podman , you can use following command.
+
+```bash
+export ORACLE_DBNAME=ORCLCDB
+podman run -d -t \
+ --hostname racnode-storage \
+ --dns-search=example.com  \
+ --cap-add SYS_ADMIN \
+ --cap-add AUDIT_WRITE \
+ --cap-add NET_ADMIN \
+ --volume /scratch/stage/rac-storage/$ORACLE_DBNAME:/oradata \
+ --network=rac_priv1_nw \
+ --ip=192.168.17.80 \
+ --systemd=always \
+ --restart=always \
+ --name racnode-storage \
+ localhost/oracle/rac-storage-server:latest
+```
+
+To check the racstorage container/services creation logs , please tail docker logs. It will take 10 minutes to create the racnode-storage container service.
+
+```bash
+podman exec racnode-storage tail -f /tmp/storage_setup.log
+```
+You would see successful message like below -
+```bash
+#################################################
+ Setup Completed                                 
+#################################################
+```
+
+**NOTE**: Expose directory to container which has atleast 60GB. In the above  example, we are using `/scratch/stage/rac-storage/$ORACLE_DBNAME` and you need to change values according to your env. Inside container, it will be /oradata and do not change this.
+
+In the above example, we used **192.168.17.0/24** subnet for NFS server. You can change the subnet values according to your environment.
+
+**Note** : If SELINUX is enabled on the Podman host, then you must create an SELinux policy for Oracle RAC on Podman. For details about this procedure, see "How to Configure Podman for SELinux Mode" in the publication [Oracle Real Application Clusters Installation Guide for Podman Oracle Linux x86-64](https://docs.oracle.com/en/database/oracle/oracle-database/21/racpd/target-configuration-oracle-rac-podman.html#GUID-59138DF8-3781-4033-A38F-E0466884D008).
+
 
-### Running RACStorageServer Docker container
+#### RAC Storage container for Docker Host Machine
 Execute following command to create the container:
 
 ```bash
@@ -60,7 +148,7 @@ docker run -d -t --hostname racnode-storage \
 
 **NOTE**: Expose directory to container which has atleast 60GB. In the above  example, we are using `/docker_volumes/asm_vol/$ORACLE_DBNAME` and you need to change values according to your env. Inside container, it will be /oradata and do not change this.
 
-In the above example, we used **192.168.17.0/24** subnet for NFS server. You can change the subnet values according to your environment.
+In the above example, we used **192.168.17.0/24** subnet for NFS server. You can change the subnet values according to your environment. Also, SELINUX must be disabled or in permissive mode in Docker Host Machine.
 
 To check the racstorage container/services creation logs , please tail docker logs. It will take 10 minutes to create the racnode-storage container service.
 
@@ -76,10 +164,21 @@ runOracle.sh: NFS Server is up and running
 Create NFS volume for /oradata
 #################################################
 ```
-**IMPORTANT:** The NFS volume must be `/oradata` which you will export to RAC containers for ASM storage. It will take 10 minutes for setting up NFS server.
 
-### NFS Volume
-Create NFS volume using following command:
+**IMPORTANT:** During the container startup 5 files named as `asm_disk0[1-5].img` will be created under /oradata.If the files are already present, they will not be recreated.These files can be used for ASM storage in RAC containers.
+
+### Create NFS Volume
+Create NFS volume using following command on Podman Host:
+
+```bash
+podman volume create --driver local \
+--opt type=nfs \
+--opt   o=addr=192.168.17.80,rw,bg,hard,tcp,vers=3,timeo=600,rsize=32768,wsize=32768,actimeo=0 \
+--opt device=192.168.17.80:/oradata \
+racstorage
+```
+
+Create NFS volume using following command on Docker Host:
 
 ```bash
 docker volume create --driver local \
@@ -89,4 +188,10 @@ docker volume create --driver local \
 racstorage
 ```
 
-**IMPORTANT:** If you are not using 192.168.17.0/24 subnet then you need to change **addr=192.168.17.25** based on your environment.
+**IMPORTANT:** If you are not using 192.168.17.0/24 subnet then you need to change **addr=192.168.17.80** based on your environment.
+
+**IMPORTANT:** The NFS volume must be `/oradata` which you will export to RAC containers for ASM storage. It will take 10 minutes for setting up NFS server.
+
+## Copyright
+
+Copyright (c) 2014-2024 Oracle and/or its affiliates. All rights reserved.

OracleDatabase/RAC/OracleRACStorageServer/dockerfiles/19.3.0/Dockerfile

@@ -1,6 +1,6 @@
 # LICENSE UPL 1.0
 #
-# Copyright (c) 1982-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014-2024 Oracle and/or its affiliates. All rights reserved.
 #
 # ORACLE DOCKERFILES PROJECT
 # --------------------------
@@ -16,10 +16,6 @@
 # ---------------
 FROM oraclelinux:7-slim
 
-# Maintainer
-# ----------
-MAINTAINER Paramdeep saini <[email protected]>, Sanjay Singh <[email protected]>
-
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------
 # Linux Env Variable
@@ -57,5 +53,5 @@ VOLUME ["/oradata"]
 WORKDIR /home/oracle
 
 # Define default command to start Oracle Database.
-
+# hadolint ignore=DL3025
 CMD exec $SCRIPT_DIR/$RUN_FILE

OracleDatabase/RAC/OracleRACStorageServer/dockerfiles/buildDockerImage.sh

@@ -7,7 +7,7 @@
 # 
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
-# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014-2024 Oracle and/or its affiliates. All rights reserved.
 # 
 
 usage() {
@@ -18,12 +18,12 @@ Builds a Docker Image for Oracle Database.
   
 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 Docker build option
 
 LICENSE UPL 1.0
 
-Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014-2024 Oracle and/or its affiliates. All rights reserved.
 
 EOF
   exit 0
@@ -34,9 +34,9 @@ EOF
 ##############
 
 # Parameters
-VERSION="12.2.0.1"
-SKIPMD5=0
-DOCKEROPS=""
+VERSION="latest"
+DOCKEROPS=("${DOCKEROPS[@]}")
+PROXY_SETTINGS=("${PROXY_SETTINGS[@]}")
 
 while getopts "hiv:o:" optname; do
   case "$optname" in
@@ -47,79 +47,76 @@ while getopts "hiv:o:" optname; do
       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
 done
 
+
 # Oracle Database Image Name
 IMAGE_NAME="oracle/rac-storage-server:$VERSION"
 
 # Go into version folder
-cd $VERSION
+cd "$VERSION" || { echo "Error: Unable to change to directory $VERSION"; exit 1; }
+
 
 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
 
+
 # ################## #
 # BUILDING THE IMAGE #
 # ################## #
 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 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))
 
-if [ $? -eq 0 ]; then
-cat << EOF
+  echo ""
+  cat << EOF
   Oracle RAC Storage Server Docker Image version $VERSION is ready to be extended: 
     
     --> $IMAGE_NAME
 
   Build completed in $BUILD_ELAPSED seconds.
   
 EOF
-
 else
   echo "Oracle RAC Storage Server Docker Image was NOT successfully created. Check the output and correct any reported problems with the docker build operation."
+  exit 1
 fi
-