Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RAC ignorepreeeq 21.3.0 & 19.3.0 changes #2715

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

RAC ignorepreeeq 21.3.0 & 19.3.0 changes #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3841373
RAC ignorepreeeq 21.3.0 changes
saurabhuja Oct 11, 2023
05c07a9
Merge branch 'main' into ignoreprepreq
saurabhuja Oct 11, 2023
9820581
19.3.0 ignore prereq changes
saurabhuja Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions OracleDatabase/RAC/OracleRealApplicationClusters/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,19 @@ To assist in building the images, you can use the [`buildContainerImage.sh`](htt
If you are planing to deploy Oracle RAC container image on Podman, skip to the section [Oracle RAC Container Image for Podman](#oracle-rac-container-image-for-podman).

```bash
./buildContainerImage.sh -v <Software Version> -o '--build-arg BASE_OL_IMAGE=oraclelinux:7 --build-arg SLIMMING=true|false'

# for example ./buildContainerImage.sh -v 21.3.0 -o '--build-arg BASE_OL_IMAGE=oraclelinux:7 --build-arg SLIMMING=false'
./buildContainerImage.sh -v <Software Version> -o '--build-arg BASE_OL_IMAGE=oraclelinux:7 --build-arg SLIMMING=false --build-arg IGNORE_PREREQ=false' -i
# for example ./buildContainerImage.sh -v 21.3.0 -o '--build-arg BASE_OL_IMAGE=oraclelinux:7 SLIMMING=false --build-arg IGNORE_PREREQ=false'
```

### Oracle RAC Container Image for Podman

If you are planing to deploy Oracle RAC container image on Docker, skip to the section [Oracle RAC Container Image for Docker](#oracle-rac-container-image-for-docker).

```bash
./buildContainerImage.sh -v <Software Version> -o '--build-arg BASE_OL_IMAGE=oraclelinux:8 --build-arg SLIMMING=true|false'
./buildContainerImage.sh -v <Software Version> -o '--build-arg BASE_OL_IMAGE=oraclelinux:8 --build-arg SLIMMING=false --build-arg IGNORE_PREREQ=false' -i

# for example ./buildContainerImage.sh -v 21.3.0 -o '--build-arg BASE_OL_IMAGE=oraclelinux:8 --build-arg SLIMMING=false'
# for example ./buildContainerImage.sh -v 21.3.0 -o '--build-arg BASE_OL_IMAGE=oraclelinux:8 SLIMMING=false --build-arg IGNORE_PREREQ=false'
```

- After the `21.3.0` Oracle RAC container image is built, start building a patched image with the download 21.7 RU and one-offs. To build the patch image, refer [Example of how to create a patched database image](https://github.com/oracle/docker-images/tree/main/OracleDatabase/RAC/OracleRealApplicationClusters/samples/applypatch).
Expand Down
4 changes: 3 additions & 1 deletion OracleDatabase/RAC/OracleRealApplicationClusters/dockerfiles/19.3.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ARG INSTALL_FILE_2="LINUX.X64_193000_db_home.zip"
ARG DB_EDITION="EE"
ARG USER="root"
ARG WORKDIR="/rac-work-dir"
ARG IGNORE_PREREQ=false

# Environment variables required for this build (do NOT change)
# -------------------------------------------------------------
Expand Down Expand Up @@ -106,7 +107,8 @@ ENV SETUP_LINUX_FILE="setupLinuxEnv.sh" \
CRONTAB_ENTRY="crontabEntry" \
EXPECT="/usr/bin/expect" \
BIN="/usr/sbin" \
container="true"
container="true" \
IGNORE_PREREQ=$IGNORE_PREREQ

# Use second ENV so that variable get substituted
ENV INSTALL_SCRIPTS=$INSTALL_DIR/install \
Expand Down
17 changes: 15 additions & 2 deletions OracleDatabase/RAC/OracleRealApplicationClusters/dockerfiles/19.3.0/configGrid.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ declare -x CRS_CONFIG_NODES
declare -x ANSIBLE_INSTALL='false'
declare -x GIMR_FLAG='false'
declare -x RUN_DBCA='true'
declare -x IGNORE_PREREQ=false

progname=$(basename "$0")
###################### Variabes and Constants declaration ends here ####################
Expand Down Expand Up @@ -962,7 +963,13 @@ if [ "${SINGLENIC}" == 'true' ];then
error_exit "SINGLE NIC is not supported";
else
# shellcheck disable=SC2016
cmd='su - $GRID_USER -c "$GRID_HOME/gridSetup.sh -waitforcompletion -ignorePrereq -silent -responseFile $responsefile"'
if [ "${IGNORE_PREREQ}" = true ]; then
# shellcheck disable=SC2016
cmd='su - $GRID_USER -c "$GRID_HOME/gridSetup.sh -waitforcompletion -silent -responseFile $responsefile"'
else
# shellcheck disable=SC2016
cmd='su - $GRID_USER -c "$GRID_HOME/gridSetup.sh -waitforcompletion -ignorePrereq -silent -responseFile $responsefile"'
fi
eval "$cmd"
fi
}
Expand Down Expand Up @@ -1153,7 +1160,13 @@ local responsefile=$logdir/$DBCA_RSP
local cmd
# Replace place holders in response file
# shellcheck disable=SC2016
cmd='su - $DB_USER -c "$DB_HOME/bin/dbca -silent -ignorePreReqs -createDatabase -responseFile $responsefile"'
if [ "${IGNORE_PREREQ}" = true ]; then
# shellcheck disable=SC2016
cmd='su - $DB_USER -c "$DB_HOME/bin/dbca -silent -createDatabase -responseFile $responsefile"'
else
# shellcheck disable=SC2016
cmd='su - $DB_USER -c "$DB_HOME/bin/dbca -silent -ignorePreReqs -createDatabase -responseFile $responsefile"'
fi
eval "$cmd"
}

Expand Down
4 changes: 3 additions & 1 deletion OracleDatabase/RAC/OracleRealApplicationClusters/dockerfiles/21.3.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ARG INSTALL_FILE_2="LINUX.X64_213000_db_home.zip"
ARG DB_EDITION="EE"
ARG USER="root"
ARG WORKDIR="/rac-work-dir"
ARG IGNORE_PREREQ=false

# Environment variables required for this build (do NOT change)
# -------------------------------------------------------------
Expand Down Expand Up @@ -104,7 +105,8 @@ ENV SETUP_LINUX_FILE="setupLinuxEnv.sh" \
CRONTAB_ENTRY="crontabEntry" \
EXPECT="/usr/bin/expect" \
BIN="/usr/sbin" \
container="true"
container="true" \
IGNORE_PREREQ=$IGNORE_PREREQ
# Use second ENV so that variable get substituted
# hadolint ignore=DL3044
ENV INSTALL_SCRIPTS=$INSTALL_DIR/install \
Expand Down
20 changes: 17 additions & 3 deletions OracleDatabase/RAC/OracleRealApplicationClusters/dockerfiles/21.3.0/configGrid.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ declare -x CRS_CONFIG_NODES
declare -x ANSIBLE_INSTALL='false'
declare -x GIMR_FLAG='false'
declare -x RUN_DBCA='true'
declare -x IGNORE_PREREQ=false


progname=$(basename "$0")
###################### Variabes and Constants declaration ends here ####################
Expand Down Expand Up @@ -960,8 +962,14 @@ local cmd
if [ "${SINGLENIC}" == 'true' ];then
error_exit "SINGLE NIC is not supported";
else
# shellcheck disable=SC2016
cmd='su - $GRID_USER -c "$GRID_HOME/gridSetup.sh -waitforcompletion -ignorePrereq -silent -responseFile $responsefile"'

if [ "${IGNORE_PREREQ}" = true ]; then
# shellcheck disable=SC2016
cmd='su - $GRID_USER -c "$GRID_HOME/gridSetup.sh -waitforcompletion -silent -responseFile $responsefile"'
else
# shellcheck disable=SC2016
cmd='su - $GRID_USER -c "$GRID_HOME/gridSetup.sh -waitforcompletion -ignorePrereq -silent -responseFile $responsefile"'
fi
eval "$cmd"
fi
}
Expand Down Expand Up @@ -1164,8 +1172,14 @@ rm -rf "$GRID_BASE"/diag/kfod
sleep 1

# Replace place holders in response file
if [ "${IGNORE_PREREQ}" = true ]; then
# shellcheck disable=SC2016
cmd='su - $DB_USER -c "$DB_HOME/bin/dbca -silent -ignorePreReqs -createDatabase -responseFile $responsefile"'
cmd='su - $DB_USER -c "$DB_HOME/bin/dbca -silent -createDatabase -responseFile $responsefile"'
else
# shellcheck disable=SC2016
cmd='su - $DB_USER -c "$DB_HOME/bin/dbca -silent -ignorePreReqs -createDatabase -responseFile $responsefile"'
fi

eval "$cmd"
rm -f "$responsefile"
}
Expand Down