From d57ca61026386ceaa026afb5cc045a2a8003a10c Mon Sep 17 00:00:00 2001 From: Dominik Sander Date: Mon, 25 Jan 2016 21:09:31 +0100 Subject: [PATCH] Fix mysql connection check for multi-process docker image Fixes #1241 --- docker/multi-process/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/multi-process/scripts/init b/docker/multi-process/scripts/init index 49e489f2..a4f7136d 100755 --- a/docker/multi-process/scripts/init +++ b/docker/multi-process/scripts/init @@ -118,7 +118,7 @@ EOF # wait for mysql server to start (max 120 seconds) timeout=120 - while ! mysqladmin -u root status >/dev/null 2>&1 + while ! mysqladmin -u root status >/dev/null 2>&1 && ! mysqladmin -u root --password=\${DATABASE_PASSWORD} status >/dev/null 2>&1 do (( timeout = timeout - 1 )) if [ \$timeout -eq 0 ]; then