Skip to content

Commit 9380765

Browse files
committed
Enhancement: check if it is a file before cat the file into init-file
1 parent 215d715 commit 9380765

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

5.5/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ if [ ! -d '/var/lib/mysql/mysql' -a "${1%_safe}" = 'mysqld' ]; then
3636
INIT_DIR='/docker-entrypoint-initdb.d'
3737
for f in $INIT_DIR/*.sql
3838
do
39+
if [ -f $f ]; then
3940
echo "Appending sql script: $f"
4041
cat $f >> "$TEMP_FILE"
42+
fi
4143
done
4244

4345
echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE"

5.6/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ if [ ! -d '/var/lib/mysql/mysql' -a "${1%_safe}" = 'mysqld' ]; then
3636
INIT_DIR='/docker-entrypoint-initdb.d'
3737
for f in $INIT_DIR/*.sql
3838
do
39+
if [ -f $f ]; then
3940
echo "Appending sql script: $f"
4041
cat $f >> "$TEMP_FILE"
42+
fi
4143
done
4244

4345
echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE"

5.7/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ if [ ! -d '/var/lib/mysql/mysql' -a "${1%_safe}" = 'mysqld' ]; then
3636
INIT_DIR='/docker-entrypoint-initdb.d'
3737
for f in $INIT_DIR/*.sql
3838
do
39+
if [ -f $f ]; then
3940
echo "Appending sql script: $f"
4041
cat $f >> "$TEMP_FILE"
42+
fi
4143
done
4244

4345
echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE"

0 commit comments

Comments
 (0)