Fix behavior during initialization timeout

docker-library · Apr 28, 2017 · c3c29b7 · c3c29b7
1 parent 6b1dc54
commit c3c29b7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
@@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in {${MYSQL_START_TIMEOUT:-30}..0}; do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
 			echo 'MySQL init process in progress...'
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi
 

diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
@@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in $(seq ${MYSQL_START_TIMEOUT:-30} -1 1); do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
-			echo 'MySQL init process in progress...'
+			echo "MySQL init process in progress..."
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi
 

diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
@@ -104,15 +104,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in {${MYSQL_START_TIMEOUT:-30}..0}; do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
 			echo 'MySQL init process in progress...'
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi
 

diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
@@ -104,15 +104,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in {${MYSQL_START_TIMEOUT:-30}..0}; do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
 			echo 'MySQL init process in progress...'
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi