From 872b40a963388da68273a42467ef94819614db1a Mon Sep 17 00:00:00 2001 From: Aditya Jain Date: Fri, 10 Jan 2025 21:58:39 +0530 Subject: [PATCH] Replaced 23.5 with 23.6 dockerfiles (#2899) --- OracleDatabase/SingleInstance/README.md | 12 ++++++------ .../{23.5.0 => 23.6.0}/Containerfile.free | 2 +- .../dockerfiles/{23.5.0 => 23.6.0}/checkDBStatus.sh | 0 .../dockerfiles/{23.5.0 => 23.6.0}/checkSpace.sh | 0 .../dockerfiles/{23.5.0 => 23.6.0}/configTcps.sh | 0 .../dockerfiles/{23.5.0 => 23.6.0}/createDB.sh | 0 .../{23.5.0 => 23.6.0}/decryptPassword.sh | 0 .../{23.5.0 => 23.6.0}/oracle-free-23ai.conf | 0 .../dockerfiles/{23.5.0 => 23.6.0}/runOracle.sh | 0 .../dockerfiles/{23.5.0 => 23.6.0}/runUserScripts.sh | 0 .../dockerfiles/{23.5.0 => 23.6.0}/setPassword.sh | 0 .../dockerfiles/{23.5.0 => 23.6.0}/setupLinuxEnv.sh | 0 .../dockerfiles/buildContainerImage.sh | 4 ++-- 13 files changed, 9 insertions(+), 9 deletions(-) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/Containerfile.free (98%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/checkDBStatus.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/checkSpace.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/configTcps.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/createDB.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/decryptPassword.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/oracle-free-23ai.conf (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/runOracle.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/runUserScripts.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/setPassword.sh (100%) rename OracleDatabase/SingleInstance/dockerfiles/{23.5.0 => 23.6.0}/setupLinuxEnv.sh (100%) diff --git a/OracleDatabase/SingleInstance/README.md b/OracleDatabase/SingleInstance/README.md index 640acf4a53..09f8f55123 100644 --- a/OracleDatabase/SingleInstance/README.md +++ b/OracleDatabase/SingleInstance/README.md @@ -36,7 +36,7 @@ Sample container build files to facilitate installation, configuration, and envi This project offers sample Dockerfiles for: -* Oracle Database 23ai (23.5.0) Free +* Oracle Database 23ai (23.6.0) Free * Oracle Database 21c (21.3.0) Enterprise Edition, Standard Edition 2 and Express Edition (XE) * Oracle Database 19c (19.3.0) Enterprise Edition and Standard Edition 2 * Oracle Database 18c (18.4.0) Express Edition (XE) @@ -67,7 +67,7 @@ Before you build the image make sure that you have provided the installation bin Parameters: -v: version to build - Choose one of: 11.2.0.2 12.1.0.2 12.2.0.1 18.3.0 18.4.0 19.3.0 21.3.0 23.5.0 + Choose one of: 11.2.0.2 12.1.0.2 12.2.0.1 18.3.0 18.4.0 19.3.0 21.3.0 23.6.0 -t: image_name:tag for the generated docker image -e: creates image based on 'Enterprise Edition' -s: creates image based on 'Standard Edition 2' @@ -247,7 +247,7 @@ Users can generate public-private key pair and pass database password (encrypted * Run the Oracle Database 23ai Free image with the secrets - podman run -td --name= --secret=oracle_pwd --secret=oracle_pwd_privkey oracle/database:23.5.0-free + podman run -td --name= --secret=oracle_pwd --secret=oracle_pwd_privkey oracle/database:23.6.0-free #### Selecting the Edition (Supported from 19.3.0 release) @@ -368,7 +368,7 @@ To run your Oracle Database 23ai Free container image use the `podman run` comma -e ENABLE_ARCHIVELOG=true \ -e ENABLE_FORCE_LOGGING=true \ -v [:]/opt/oracle/oradata \ - oracle/database:23.5.0-free + oracle/database:23.6.0-free Parameters: --name: The name of the container (default: auto generated) @@ -533,7 +533,7 @@ Set up a podman network for inter-container communication using the following co -e ENABLE_ARCHIVELOG=true \ -e ENABLE_FORCE_LOGGING=true \ -v [:]/opt/oracle/oradata \ - oracle/database:23.5.0-free + oracle/database:23.6.0-free Ensure that your Primary Database container is up and running and in a healthy state. @@ -552,7 +552,7 @@ You need to run the preceding podman run command with the host mount point (empt -e PRIMARY_DB_PWD_FILE=/var/tmp/orapwFREE \ -e PRIMARY_DB_CONN_STR=:1521/FREE \ -v [:]/opt/oracle/oradata \ - oracle/database:23.5.0-free + oracle/database:23.6.0-free **Note:** If a common host mount point is used for both pri-db-free and tru-cc-free containers, then you may skip the podman cp step by specifying the location of pri-db-free password file directly using \ -e PRIMARY_DB_PWD_FILE=/opt/oracle/product/23ai/dbhomeFree/dbs/orapwFREE diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/Containerfile.free b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/Containerfile.free similarity index 98% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/Containerfile.free rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/Containerfile.free index 7af0793213..c9cf5a1be3 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/Containerfile.free +++ b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/Containerfile.free @@ -13,7 +13,7 @@ # HOW TO BUILD THIS IMAGE # ----------------------- # Run: -# $ podman build -t oracle/database:23.5.0-free -f Containerfile.free . +# $ podman build -t oracle/database:23.6.0-free -f Containerfile.free . # # # Pull base image diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/checkDBStatus.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/checkDBStatus.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/checkDBStatus.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/checkDBStatus.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/checkSpace.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/checkSpace.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/checkSpace.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/checkSpace.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/configTcps.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/configTcps.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/configTcps.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/configTcps.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/createDB.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/createDB.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/createDB.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/createDB.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/decryptPassword.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/decryptPassword.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/decryptPassword.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/decryptPassword.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/oracle-free-23ai.conf b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/oracle-free-23ai.conf similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/oracle-free-23ai.conf rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/oracle-free-23ai.conf diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/runOracle.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/runOracle.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/runOracle.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/runOracle.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/runUserScripts.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/runUserScripts.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/runUserScripts.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/runUserScripts.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/setPassword.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/setPassword.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/setPassword.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/setPassword.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/23.5.0/setupLinuxEnv.sh b/OracleDatabase/SingleInstance/dockerfiles/23.6.0/setupLinuxEnv.sh similarity index 100% rename from OracleDatabase/SingleInstance/dockerfiles/23.5.0/setupLinuxEnv.sh rename to OracleDatabase/SingleInstance/dockerfiles/23.6.0/setupLinuxEnv.sh diff --git a/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh b/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh index 430c07125a..bb42600d81 100755 --- a/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh +++ b/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh @@ -185,7 +185,7 @@ if [ "$(arch)" == "aarch64" ] || [ "$(arch)" == "arm64" ]; then PLATFORM=".arm64" if { [ "${VERSION}" == "19.3.0" ] && [ "${ENTERPRISE}" -eq 1 ]; }; then BUILD_OPTS=("--build-arg" "INSTALL_FILE_1=LINUX.ARM64_1919000_db_home.zip" "${BUILD_OPTS[@]}") - elif { [ "${VERSION}" == "23.5.0" ] && [ "${FREE}" -eq 1 ]; }; then + elif { [ "${VERSION}" == "23.6.0" ] && [ "${FREE}" -eq 1 ]; }; then BUILD_OPTS=("--build-arg" "INSTALL_FILE_1=https://download.oracle.com/otn-pub/otn_software/db-free/oracle-database-free-23ai-1.0-1.el8.aarch64.rpm" "${BUILD_OPTS[@]}") else echo "Currently only 19c enterprise edition is supported on ARM64 platform."; @@ -231,7 +231,7 @@ cd "${VERSION}" || { } # Which Dockerfile should be used? -if [ "${VERSION}" == "12.1.0.2" ] || [ "${VERSION}" == "11.2.0.2" ] || [ "${VERSION}" == "18.4.0" ] || [ "${VERSION}" == "23.5.0" ] || { [ "${VERSION}" == "21.3.0" ] && [ "${EDITION}" == "xe" ]; }; then +if [ "${VERSION}" == "12.1.0.2" ] || [ "${VERSION}" == "11.2.0.2" ] || [ "${VERSION}" == "18.4.0" ] || [ "${VERSION}" == "23.6.0" ] || { [ "${VERSION}" == "21.3.0" ] && [ "${EDITION}" == "xe" ]; }; then DOCKERFILE=$( if [[ -f "Containerfile.${EDITION}" ]]; then echo "Containerfile.${EDITION}"; else echo "${DOCKERFILE}.${EDITION}";fi ) fi;