Skip to content

Commit fb854eb

Browse files
felipecrsfelipecrs
committed
Fix linter issues
1 parent 4697ec7 commit fb854eb

23 files changed

+52
-20
lines changed

‎OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ RUN yum -y install unzip libaio bc initscripts net-tools openssl compat-libstdc+
9090
HEALTHCHECK --interval=1m --start-period=5m \
9191
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
9292

93-
CMD exec $ORACLE_BASE/$RUN_FILE
93+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/checkDBStatus.sh

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1818
fi
1919

2020
POSITIVE_RETURN="OPEN"
21+
# shellcheck disable=SC2034
2122
ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
2223

2324
# Check Oracle DB status and store it in status

‎OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/runOracle.sh

100644100755
+6-2
Original file line numberDiff line numberDiff 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
@@ -175,7 +179,7 @@ fi;
175179
/etc/init.d/oracle-xe start | grep -qc "Oracle Database 11g Express Edition is not configured"
176180
if [ "$?" == "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."

‎OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
120120
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
121121

122122
# Define default command to start Oracle Database.
123-
CMD exec $ORACLE_BASE/$RUN_FILE
123+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
120120
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
121121

122122
# Define default command to start Oracle Database.
123-
CMD exec $ORACLE_BASE/$RUN_FILE
123+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/checkDBStatus.sh

+3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717
exit 1
1818
fi
1919

20+
# shellcheck disable=SC2034
2021
ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
2122
OPEN_MODE="READ WRITE"
23+
# shellcheck disable=SC2034
2224
ORAENV_ASK=NO
25+
# shellcheck disable=SC1090
2326
source oraenv
2427

2528
# Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status

‎OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
117117
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
118118

119119
# Define default command to start Oracle Database.
120-
CMD exec $ORACLE_BASE/$RUN_FILE
120+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/checkDBStatus.sh

+3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717
exit 1
1818
fi
1919

20+
# shellcheck disable=SC2034
2021
ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
2122
OPEN_MODE="READ WRITE"
23+
# shellcheck disable=SC2034
2224
ORAENV_ASK=NO
25+
# shellcheck disable=SC1090
2326
source oraenv
2427

2528
# Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status

‎OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ HEALTHCHECK --interval=1m --start-period=5m \
117117
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
118118

119119
# Define default command to start Oracle Database.
120-
CMD exec $ORACLE_BASE/$RUN_FILE
120+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/18.3.0/checkDBStatus.sh

+3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717
exit 1
1818
fi
1919

20+
# shellcheck disable=SC2034
2021
ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
2122
OPEN_MODE="READ WRITE"
23+
# shellcheck disable=SC2034
2224
ORAENV_ASK=NO
25+
# shellcheck disable=SC1090
2326
source oraenv
2427

2528
# Check Oracle at least one PDB has open_mode "READ WRITE" and store it in status

‎OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
8181
HEALTHCHECK --interval=1m --start-period=5m \
8282
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
8383

84-
CMD exec $ORACLE_BASE/$RUN_FILE
84+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/18.4.0/checkDBStatus.sh

+3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ if [ "$IGNORE_DB_STARTED_MARKER" != true ] && [ ! -f "$DB_STARTED_MARKER_FILE" ]
1717
exit 1
1818
fi
1919

20+
# shellcheck disable=SC2034
2021
ORACLE_SID="`grep $ORACLE_HOME /etc/oratab | cut -d: -f1`"
2122
OPEN_MODE="READ WRITE"
23+
# shellcheck disable=SC2034
2224
ORAENV_ASK=NO
25+
# shellcheck disable=SC1090
2326
source oraenv
2427

2528
[ -f "$ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/oratab" ] || exit 1;

‎OracleDatabase/SingleInstance/dockerfiles/18.4.0/runOracle.sh

100644100755
+5-1
Original file line numberDiff line numberDiff 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

‎OracleDatabase/SingleInstance/dockerfiles/19.3.0/checkDBStatus.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,19 @@ fi
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

8687
if [ "$DG_OBSERVER_ONLY" = "true" ]; then
8788
checkObserver
8889
else
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

‎OracleDatabase/SingleInstance/dockerfiles/19.3.0/runOracle.sh

+3-1
Original file line numberDiff line numberDiff 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"/

‎OracleDatabase/SingleInstance/dockerfiles/21.3.0/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ HEALTHCHECK --interval=1m --start-period=5m --timeout=30s \
140140
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
141141

142142
# Define default command to start Oracle Database.
143-
CMD exec $ORACLE_BASE/$RUN_FILE
143+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/21.3.0/Dockerfile.xe

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ WORKDIR /home/oracle
9191
HEALTHCHECK --interval=1m --start-period=5m --timeout=30s \
9292
CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
9393

94-
CMD [ "/bin/bash", "-c", "$ORACLE_BASE/$RUN_FILE" ]
94+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/21.3.0/checkDBStatus.sh

100644100755
+4-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ fi
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

8687
# Sanitizing env for XE Database
@@ -93,7 +94,9 @@ if [ "$DG_OBSERVER_ONLY" = "true" ]; then
9394
else
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

‎OracleDatabase/SingleInstance/dockerfiles/21.3.0/runOracle.sh

100644100755
+4-2
Original file line numberDiff line numberDiff 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

@@ -170,7 +170,8 @@ fi;
170170

171171
# Setting up ORACLE_PWD if podman secret is passed on
172172
if [ -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
174175
fi
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
232233
if [ "${ORACLE_SID}" != "XE" ]; then
234+
# shellcheck disable=SC1090
233235
source "$ORACLE_BASE/$RELINK_BINARY_FILE"
234236
fi;
235237

‎OracleDatabase/SingleInstance/dockerfiles/23.6.0/Containerfile.free

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,4 @@ HEALTHCHECK --interval=1m --start-period=5m --timeout=30s \
119119

120120
EXPOSE 1521/tcp
121121

122-
CMD [ "/bin/bash", "-c", "$ORACLE_BASE/$RUN_FILE" ]
122+
CMD [ "/bin/bash", "-c", "exec $ORACLE_BASE/$RUN_FILE" ]

‎OracleDatabase/SingleInstance/dockerfiles/23.6.0/checkDBStatus.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ else
9797
DB_ROLE=""
9898
# shellcheck disable=SC2034
9999
ORAENV_ASK=NO
100-
# shellcheck source=/dev/null
100+
# shellcheck disable=SC1090
101101
source oraenv
102102
checkDatabaseRole
103103
checkPDBOpen

‎OracleDatabase/SingleInstance/dockerfiles/23.6.0/runOracle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export ORACLE_CHARACTERSET=${ORACLE_CHARACTERSET:-AL32UTF8}
222222

223223
# Call relinkOracleBinary.sh before the database is created or started
224224
if [ "${ORACLE_SID}" != "FREE" ]; then
225-
# shellcheck source=/dev/null
225+
# shellcheck disable=SC1090
226226
source "$ORACLE_BASE/$RELINK_BINARY_FILE"
227227
fi;
228228

‎OracleDatabase/SingleInstance/dockerfiles/23.6.0/runUserScripts.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [ -d "$SCRIPTS_ROOT" ] && [ -n "$(ls -A "$SCRIPTS_ROOT")" ]; then
2727
for f in "$SCRIPTS_ROOT"/*; do
2828
case "$f" in
2929
*.sh) echo "$0: running $f";
30-
# shellcheck source=/dev/null
30+
# shellcheck disable=SC1090
3131
. "$f" ;;
3232
*.sql) echo "$0: running $f"; echo "exit" | "$ORACLE_HOME"/bin/sqlplus -s "/ as sysdba" @"$f"; echo ;;
3333
*) echo "$0: ignoring $f" ;;

0 commit comments

Comments
 (0)