Merge pull request #453 from banzaicloud/fix-initdb-silent-fail

fix silently skipped init scripts
docker-library · Jul 30, 2018 · 333935a · 333935a
2 parents 075c24d + 381a03b
commit 333935a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
@@ -186,6 +186,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
+		ls /docker-entrypoint-initdb.d/ > /dev/null
 		for f in /docker-entrypoint-initdb.d/*; do
 			process_init_file "$f" "${mysql[@]}"
 		done

diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
@@ -186,6 +186,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
+		ls /docker-entrypoint-initdb.d/ > /dev/null
 		for f in /docker-entrypoint-initdb.d/*; do
 			process_init_file "$f" "${mysql[@]}"
 		done

diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
@@ -191,6 +191,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
+		ls /docker-entrypoint-initdb.d/ > /dev/null
 		for f in /docker-entrypoint-initdb.d/*; do
 			process_init_file "$f" "${mysql[@]}"
 		done

diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
@@ -193,6 +193,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
+		ls /docker-entrypoint-initdb.d/ > /dev/null
 		for f in /docker-entrypoint-initdb.d/*; do
 			process_init_file "$f" "${mysql[@]}"
 		done
-Original file line number
+Diff line change
@@ Expand Up / @@ -186,6 +186,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then @@
     		fi
     		echo
+    		ls /docker-entrypoint-initdb.d/ > /dev/null
     		for f in /docker-entrypoint-initdb.d/*; do
     			process_init_file "$f" "${mysql[@]}"
     		done
@@ Expand Down @@