File tree Expand file tree Collapse file tree 13 files changed +38
-10
lines changed
OracleDatabase/SingleInstance/dockerfiles Expand file tree Collapse file tree 13 files changed +38
-10
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1818fi
1919
2020POSITIVE_RETURN=" OPEN"
21+ # shellcheck disable=SC2034
2122ORACLE_SID=" ` grep $ORACLE_HOME /etc/oratab | cut -d: -f1` "
2223
2324# Check Oracle DB status and store it in status
Original file line number Diff line number Diff line change @@ -19,7 +19,11 @@ function runUserScripts {
1919
2020 for f in $SCRIPTS_ROOT /* ; do
2121 case " $f " in
22- * .sh) echo " $0 : running $f " ; . " $f " ;;
22+ * .sh)
23+ echo " $0 : running $f "
24+ # shellcheck disable=SC1090
25+ . " $f "
26+ ;;
2327 * .sql) echo " $0 : running $f " ; echo " exit" | su -p oracle -c " $ORACLE_HOME /bin/sqlplus / as sysdba @$f " ; echo ;;
2428 * ) echo " $0 : ignoring $f " ;;
2529 esac
175179/etc/init.d/oracle-xe start | grep -qc " Oracle Database 11g Express Edition is not configured"
176180if [ " $? " == " 0" ]; then
177181 # Check whether container has enough memory
178- if [ ` df -Pk /dev/shm | tail -n 1 | awk ' {print $2}' ` -lt 1048576 ]; then
182+ if [ " ` df -Pk /dev/shm | tail -n 1 | awk ' {print $2}' ` " -lt 1048576 ]; then
179183 echo " Error: The container doesn't have enough memory allocated."
180184 echo " A database XE container needs at least 1 GB of shared memory (/dev/shm)."
181185 echo " You currently only have $(( `df - Pk / dev/ shm | tail - n 1 | awk '{print $2 }'`/ 1024 )) MB allocated to the container."
Original file line number Diff line number Diff line change @@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717 exit 1
1818fi
1919
20+ # shellcheck disable=SC2034
2021ORACLE_SID=" ` grep $ORACLE_HOME /etc/oratab | cut -d: -f1` "
2122OPEN_MODE=" READ WRITE"
23+ # shellcheck disable=SC2034
2224ORAENV_ASK=NO
25+ # shellcheck disable=SC1090
2326source oraenv
2427
2528# Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status
Original file line number Diff line number Diff line change @@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717 exit 1
1818fi
1919
20+ # shellcheck disable=SC2034
2021ORACLE_SID=" ` grep $ORACLE_HOME /etc/oratab | cut -d: -f1` "
2122OPEN_MODE=" READ WRITE"
23+ # shellcheck disable=SC2034
2224ORAENV_ASK=NO
25+ # shellcheck disable=SC1090
2326source oraenv
2427
2528# Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status
Original file line number Diff line number Diff line change @@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717 exit 1
1818fi
1919
20+ # shellcheck disable=SC2034
2021ORACLE_SID=" ` grep $ORACLE_HOME /etc/oratab | cut -d: -f1` "
2122OPEN_MODE=" READ WRITE"
23+ # shellcheck disable=SC2034
2224ORAENV_ASK=NO
25+ # shellcheck disable=SC1090
2326source oraenv
2427
2528# Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status
Original file line number Diff line number Diff line change @@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717 exit 1
1818fi
1919
20+ # shellcheck disable=SC2034
2021ORACLE_SID=" ` grep $ORACLE_HOME /etc/oratab | cut -d: -f1` "
2122OPEN_MODE=" READ WRITE"
23+ # shellcheck disable=SC2034
2224ORAENV_ASK=NO
25+ # shellcheck disable=SC1090
2326source oraenv
2427
2528[ -f " $ORACLE_BASE /oradata/dbconfig/$ORACLE_SID /oratab" ] || exit 1;
Original file line number Diff line number Diff line change 8080
8181# Setting up ORACLE_PWD if podman secret is passed on
8282 if [ -e ' /run/secrets/oracle_pwd' ]; then
83- export ORACLE_PWD=" $( cat ' /run/secrets/oracle_pwd' ) "
83+ ORACLE_PWD=" $( cat ' /run/secrets/oracle_pwd' ) "
84+ export ORACLE_PWD
8485 fi
8586
8687if [ " $DG_OBSERVER_ONLY " = " true" ]; then
8788 checkObserver
8889else
90+ # shellcheck disable=SC2034
8991 ORACLE_SID=" $( grep " $ORACLE_HOME " /etc/oratab | cut -d: -f1) "
9092 DB_ROLE=" "
93+ # shellcheck disable=SC2034
9194 ORAENV_ASK=NO
95+ # shellcheck disable=SC1090
9296 source oraenv
9397 checkDatabaseRole
9498 checkPDBOpen
Original file line number Diff line number Diff line change @@ -22,7 +22,9 @@ function moveFiles {
2222 mv " $ORACLE_HOME " /network/admin/sqlnet.ora " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
2323 mv " $ORACLE_HOME " /network/admin/listener.ora " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
2424 mv " $ORACLE_HOME " /network/admin/tnsnames.ora " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
25- mv " $ORACLE_HOME " /install/.docker_* " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
25+ if [ -n " $( shopt -s nullglob; echo " $ORACLE_HOME " /install/.docker_* ) " ]; then
26+ mv " $ORACLE_HOME " /install/.docker_* " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
27+ fi ;
2628
2729 # oracle user does not have permissions in /etc, hence cp and not mv
2830 cp /etc/oratab " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
Original file line number Diff line number Diff line change 8080
8181# Setting up ORACLE_PWD if podman secret is passed on
8282if [ -e ' /run/secrets/oracle_pwd' ]; then
83- export ORACLE_PWD=" $( cat ' /run/secrets/oracle_pwd' ) "
83+ ORACLE_PWD=" $( cat ' /run/secrets/oracle_pwd' ) "
84+ export ORACLE_PWD
8485fi
8586
8687# Sanitizing env for XE Database
@@ -93,7 +94,9 @@ if [ "$DG_OBSERVER_ONLY" = "true" ]; then
9394else
9495 ORACLE_SID=" $( grep " $ORACLE_HOME " /etc/oratab | cut -d: -f1) "
9596 DB_ROLE=" "
97+ # shellcheck disable=SC2034
9698 ORAENV_ASK=NO
99+ # shellcheck disable=SC1090
97100 source oraenv
98101 checkDatabaseRole
99102 checkPDBOpen
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ function moveFiles {
2222 mv " $ORACLE_BASE_HOME " /network/admin/sqlnet.ora " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
2323 mv " $ORACLE_BASE_HOME " /network/admin/listener.ora " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
2424 mv " $ORACLE_BASE_HOME " /network/admin/tnsnames.ora " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
25- if [ -a " $ORACLE_HOME " /install/.docker_* ]; then
25+ if [ -n " $( shopt -s nullglob ; echo " $ ORACLE_HOME" /install/.docker_* ) " ]; then
2626 mv " $ORACLE_HOME " /install/.docker_* " $ORACLE_BASE " /oradata/dbconfig/" $ORACLE_SID " /
2727 fi ;
2828
170170
171171# Setting up ORACLE_PWD if podman secret is passed on
172172if [ -e ' /run/secrets/oracle_pwd' ]; then
173- export ORACLE_PWD=" $( cat ' /run/secrets/oracle_pwd' ) "
173+ ORACLE_PWD=" $( cat ' /run/secrets/oracle_pwd' ) "
174+ export ORACLE_PWD
174175fi
175176
176177# Sanitizing env for XE
@@ -230,6 +231,7 @@ export ORACLE_CHARACTERSET=${ORACLE_CHARACTERSET:-AL32UTF8}
230231
231232# Call relinkOracleBinary.sh before the database is created or started
232233if [ " ${ORACLE_SID} " != " XE" ]; then
234+ # shellcheck disable=SC1090
233235 source " $ORACLE_BASE /$RELINK_BINARY_FILE "
234236fi ;
235237
You can’t perform that action at this time.
0 commit comments