浏览代码

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

Fix mysql connection check for multi-process docker image
Dominik Sander 9 年之前
父节点
当前提交
129f3d61c9
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      docker/multi-process/scripts/init

+ 1 - 1
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