Merge pull request #1243 from dsander/fix-docker-mysql-connection-check

Fix mysql connection check for multi-process docker image
This commit is contained in:
Dominik Sander 2016-02-04 23:49:28 +01:00
commit 129f3d61c9

View file

@ -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