Merge branch 'master' of https://github.com/oraclebase/vagrant

oraclebase · oraclebase · commit d41cc6969d5f · 2024-12-12T14:44:03.000Z
diff --git a/containers/ol7/docker/scripts/builds.sh b/containers/ol7/docker/scripts/builds.sh
@@ -20,7 +20,7 @@ docker pull oraclelinux:8-slim
 # Copy ORDS software and do build (OL7).
 cd /u01/dockerfiles/ords/ol7_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
@@ -30,7 +30,7 @@ docker build --no-cache -t ol7_ords:latest .
 # Copy ORDS software and do build (OL8).
 cd /u01/dockerfiles/ords/ol8_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
diff --git a/containers/ol8/docker/scripts/builds.sh b/containers/ol8/docker/scripts/builds.sh
@@ -20,7 +20,7 @@ docker pull oraclelinux:8-slim
 # Copy ORDS software and do build (OL7).
 cd /u01/dockerfiles/ords/ol7_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
@@ -30,7 +30,7 @@ docker build --no-cache -t ol7_ords:latest .
 # Copy ORDS software and do build (OL8).
 cd /u01/dockerfiles/ords/ol8_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
diff --git a/containers/ol8/podman/scripts/builds.sh b/containers/ol8/podman/scripts/builds.sh
@@ -21,7 +21,7 @@ podman pull oraclelinux:8
 # Copy ORDS software and do build (OL7).
 cd /u01/dockerfiles/ords/ol7_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
@@ -31,7 +31,7 @@ podman build --format docker --no-cache -t ol7_ords:latest .
 # Copy ORDS software and do build (OL8).
 cd /u01/dockerfiles/ords/ol8_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
diff --git a/containers/ol9/podman/scripts/builds.sh b/containers/ol9/podman/scripts/builds.sh
@@ -21,7 +21,7 @@ podman pull oraclelinux:8
 # Copy ORDS software and do build (OL7).
 cd /u01/dockerfiles/ords/ol7_ords/software
 cp /vagrant/software/apex_24.1_en.zip .
-cp /vagrant/software/apache-tomcat-9.0.96.tar.gz .
+cp /vagrant/software/apache-tomcat-9.0.97.tar.gz .
 cp /vagrant/software/ords-latest.zip .
 cp /vagrant/software/sqlcl-latest.zip .
 cp /vagrant/software/graalvm-jdk-21_linux-x64_bin.tar.gz .
diff --git a/database/ol7_112/config/install.env b/database/ol7_112/config/install.env
@@ -24,7 +24,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol7_121/config/install.env b/database/ol7_121/config/install.env
@@ -25,7 +25,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol7_122/config/install.env b/database/ol7_122/config/install.env
@@ -25,7 +25,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol7_183/config/install.env b/database/ol7_183/config/install.env
@@ -25,7 +25,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol7_19/config/install.env b/database/ol7_19/config/install.env
@@ -25,7 +25,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol7_21/config/install.env b/database/ol7_21/config/install.env
@@ -26,7 +26,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol8_121/config/install.env b/database/ol8_121/config/install.env
@@ -25,7 +25,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol8_183/config/install.env b/database/ol8_183/config/install.env
@@ -25,7 +25,7 @@ export INSTALL_ORDS="true"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol8_19/config/install.env b/database/ol8_19/config/install.env
@@ -71,7 +71,7 @@ export PATCH_PATH2=${PATCH_TOP}/36878697
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol8_21/config/install.env b/database/ol8_21/config/install.env
@@ -33,7 +33,7 @@ export PATCH_TOP=${SOFTWARE_DIR}/35428978
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol8_23/config/install.env b/database/ol8_23/config/install.env
@@ -33,7 +33,7 @@ export PATCH_TOP=${SOFTWARE_DIR}/34527084
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol8_23/scripts/oracle_software_installation.sh b/database/ol8_23/scripts/oracle_software_installation.sh
@@ -10,20 +10,34 @@ unzip -oq /vagrant/software/${DB_SOFTWARE}
 echo "******************************************************************************"
 echo "Do software-only installation." `date`
 echo "******************************************************************************"
-${ORACLE_HOME}/runInstaller -ignorePrereq -waitforcompletion -silent           \
-    -responseFile ${ORACLE_HOME}/install/response/db_install.rsp               \
-    oracle.install.option=INSTALL_DB_SWONLY                                    \
-    ORACLE_HOSTNAME=${ORACLE_HOSTNAME}                                         \
-    UNIX_GROUP_NAME=oinstall                                                   \
-    INVENTORY_LOCATION=${ORA_INVENTORY}                                        \
-    SELECTED_LANGUAGES=en,en_GB                                                \
-    ORACLE_HOME=${ORACLE_HOME}                                                 \
-    ORACLE_BASE=${ORACLE_BASE}                                                 \
-    oracle.install.db.InstallEdition=EE                                        \
-    oracle.install.db.OSDBA_GROUP=dba                                          \
-    oracle.install.db.OSBACKUPDBA_GROUP=dba                                    \
-    oracle.install.db.OSDGDBA_GROUP=dba                                        \
-    oracle.install.db.OSKMDBA_GROUP=dba                                        \
-    oracle.install.db.OSRACDBA_GROUP=dba                                       \
-    SECURITY_UPDATES_VIA_MYORACLESUPPORT=false                                 \
-    DECLINE_SECURITY_UPDATES=true
+#${ORACLE_HOME}/runInstaller -ignorePrereq -waitforcompletion -silent           \
+#    -responseFile ${ORACLE_HOME}/install/response/db_install.rsp               \
+#    oracle.install.option=INSTALL_DB_SWONLY                                    \
+#    ORACLE_HOSTNAME=${ORACLE_HOSTNAME}                                         \
+#    UNIX_GROUP_NAME=oinstall                                                   \
+#    INVENTORY_LOCATION=${ORA_INVENTORY}                                        \
+#    SELECTED_LANGUAGES=en,en_GB                                                \
+#    ORACLE_HOME=${ORACLE_HOME}                                                 \
+#    ORACLE_BASE=${ORACLE_BASE}                                                 \
+#    oracle.install.db.InstallEdition=EE                                        \
+#    oracle.install.db.OSDBA_GROUP=dba                                          \
+#    oracle.install.db.OSBACKUPDBA_GROUP=dba                                    \
+#    oracle.install.db.OSDGDBA_GROUP=dba                                        \
+#    oracle.install.db.OSKMDBA_GROUP=dba                                        \
+#    oracle.install.db.OSRACDBA_GROUP=dba                                       \
+#    SECURITY_UPDATES_VIA_MYORACLESUPPORT=false                                 \
+#    DECLINE_SECURITY_UPDATES=true
+
+${ORACLE_HOME}/runInstaller -ignorePrereq -waitforcompletion -silent \
+    -responseFile ${ORACLE_HOME}/install/response/db_install.rsp     \
+    installOption=INSTALL_DB_SWONLY                                  \
+    UNIX_GROUP_NAME=oinstall                                         \
+    INVENTORY_LOCATION=${ORA_INVENTORY}                              \
+    ORACLE_HOME=${ORACLE_HOME}                                       \
+    ORACLE_BASE=${ORACLE_BASE}                                       \
+    installEdition=EE                                                \
+    OSDBA=dba                                                        \
+    OSBACKUPDBA=dba                                                  \
+    OSDGDBA=dba                                                      \
+    OSKMDBA=dba                                                      \
+    OSRACDBA=dba
diff --git a/database/ol8_23_free/config/install.env b/database/ol8_23_free/config/install.env
@@ -19,7 +19,7 @@ export APEX_PASSWORD="ApexPassword1"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol9_19/config/install.env b/database/ol9_19/config/install.env
@@ -71,7 +71,7 @@ export PATCH_PATH2=${PATCH_TOP}/36878697
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
diff --git a/database/ol9_23_free/config/install.env b/database/ol9_23_free/config/install.env
@@ -19,7 +19,7 @@ export APEX_PASSWORD="ApexPassword1"
 
 # ORDS installation settings.
 export JAVA_SOFTWARE="graalvm-jdk-21_linux-x64_bin.tar.gz"
-export TOMCAT_SOFTWARE="apache-tomcat-9.0.96.tar.gz"
+export TOMCAT_SOFTWARE="apache-tomcat-9.0.97.tar.gz"
 export ORDS_SOFTWARE="ords-latest.zip"
 export SQLCL_SOFTWARE="sqlcl-latest.zip"
 export SOFTWARE_DIR="/u01/software"
