Modify DB initialization completion judgment flag 24/102824/2 1.3.7
authoryangyan <yangyanyj@chinamobile.com>
Tue, 3 Mar 2020 07:43:04 +0000 (15:43 +0800)
committerYan Yang <yangyanyj@chinamobile.com>
Tue, 3 Mar 2020 07:45:49 +0000 (07:45 +0000)
Change-Id: Ic99f2b1fef441c2a8a90d53121ceb4a58a1bee01
Issue-ID: VFC-1639
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
mgr/docker/docker-entrypoint.sh

index 3f290c9..8dd4bb8 100755 (executable)
@@ -31,8 +31,8 @@ done
 # Wait for DB initialization
 echo "Wait for DB initialization"
 for i in {1..5}; do
-    curl -sS -m 1 $MYSQL_ADDR > /dev/null && break
-    sleep $i
+    mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -h`echo $MYSQL_ADDR | cut -d: -f 1` -P`echo $MYSQL_ADDR | cut -d: -f 2` -e "show databases;" > /dev/null && echo "DB initialization completed" && break
+    sleep $i && echo "`echo $MYSQL_ADDR | cut -d: -f 1` connection failed"
 done
 
 # Configure service based on docker environment variables