Merge remote-tracking branch 'origin/main' into aditya059/23.26_dockerfiles_release

Author: aditya059

.github/workflows/build-and-push-dev-images.yml

@@ -24,17 +24,17 @@ on:
     inputs:
       ol:
         description: List of ol versions to build
-        default: 'oraclelinux7, oraclelinux8, oraclelinux9'
+        default: 'oraclelinux7, oraclelinux8, oraclelinux9, oraclelinux10'
         required: false
       lang:
         description: List of languages to build
-        default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools, httpd'
+        default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools, httpd, valkey'
         required: false
 
 # Default values for the builds triggered by the push event
 env:
-  ol: 'oraclelinux7, oraclelinux8, oraclelinux9'
-  lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools, httpd'
+  ol: 'oraclelinux7, oraclelinux8, oraclelinux9, oraclelinux10'
+  lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools, httpd, valkey'
 
 jobs:
   prepare:

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/Checksum

@@ -1,2 +1,2 @@
-b7c4c66f801f92d14faa0d791ccda721  19.3.0/LINUX.X64_193000_grid_home.zip
 1858bd0d281c60f4ddabd87b1c214a4f  19.3.0/LINUX.X64_193000_db_home.zip
+b7c4c66f801f92d14faa0d791ccda721  19.3.0/LINUX.X64_193000_grid_home.zip

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/Containerfile

@@ -20,7 +20,7 @@
 #      $ docker build -t oracle/database:19c-rac .
 
 
-ARG BASE_OL_IMAGE=oraclelinux:8
+ARG BASE_OL_IMAGE=oraclelinux:9
 ARG SLIMMING=false
 # Pull base image
 # ---------------
@@ -99,7 +99,7 @@ ENV SETUP_LINUX_FILE="setupLinuxEnv.sh" \
 FROM racbase AS rac-image-slim-false
 ARG SLIMMING
 ARG VERSION
-ENV CV_ASSUME_DISTID=OEL7.8
+ENV CV_ASSUME_DISTID=OL8
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------
 # Linux Env Variable
@@ -145,7 +145,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh  && \
 FROM racbase AS rac-image-slim-true
 ARG SLIMMING
 ARG VERSION
-ENV CV_ASSUME_DISTID=OEL7.8
+ENV CV_ASSUME_DISTID=OL8
 
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/GridHomeCleanup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2019,2025 Oracle and/or its affiliates.
@@ -11,9 +12,9 @@
 #
 
 # Image Cleanup Script
-# shellcheck disable=SC1090
+
 source /home/"${GRID_USER}"/.bashrc
-# shellcheck disable=SC2034
+
 ORACLE_HOME=${GRID_HOME}
 
 rm -rf /u01/app/grid/*

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/OracleHomeCleanup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2019,2025 Oracle and/or its affiliates.
@@ -11,7 +12,7 @@
 #
 
 # Image Cleanup Script
-# shellcheck disable=SC1090
+
 source /home/"${DB_USER}"/.bashrc
 ORACLE_HOME=${DB_HOME}
 

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/applyGridPatch.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2018,2025 Oracle and/or its affiliates.
@@ -34,7 +35,7 @@ if [ "$GRID_HOME" == "" ]; then
 fi;
 
 # Install Oracle binaries
-# shellcheck disable=SC2115
+
 unzip -q "$INSTALL_SCRIPTS"/"$PATCH" -d "$GRID_USER_HOME"  && \
 rm -f "$INSTALL_SCRIPTS"/"$GRID_PATCH" && \
 cd "$GRID_USER_HOME"/"$PATCH_NUMBER"/"$PATCH_NUMBER" && \

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/checkSpace.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2018,2025 Oracle and/or its affiliates.

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/enableRAC.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2018,2025 Oracle and/or its affiliates.
@@ -8,7 +9,7 @@
 # Description: Enable RAC feature in Oracle Software
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-# shellcheck disable=SC1090
+
 source /home/"${DB_USER}"/.bashrc
 
 export ORACLE_HOME=${DB_HOME}

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/fixupPreq.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2018,2025 Oracle and/or its affiliates.

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/installDBBinaries.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=all
 # LICENSE UPL 1.0
 #
 # Copyright (c) 2018,2025 Oracle and/or its affiliates.
@@ -20,7 +21,6 @@ if [ "$EDITION" == "" ]; then
 fi;
 
 # Check whether correct edition has been passed on
-# shellcheck disable=SC2166
 if [ "$EDITION" != "EE" -a "$EDITION" != "SE2" ]; then
    echo "ERROR: Wrong edition has been passed on!"
    echo "Edition $EDITION is no a valid edition!"
@@ -60,6 +60,5 @@ fi
 
 
 # Install Oracle binaries
-# shellcheck disable=SC2015
 unzip -q "$INSTALL_SCRIPTS"/"$INSTALL_FILE_2" -d "$DB_HOME" && \
 "$DB_HOME"/runInstaller -silent -force -waitforcompletion -responsefile "$INSTALL_SCRIPTS"/"$DB_INSTALL_RSP"  -ignorePrereqFailure || true