Modify DB initialization completion judgment flag 22/102822/1 1.3.7
authoryangyan <yangyanyj@chinamobile.com>
Tue, 3 Mar 2020 07:29:09 +0000 (15:29 +0800)
committeryangyan <yangyanyj@chinamobile.com>
Tue, 3 Mar 2020 07:29:14 +0000 (15:29 +0800)
Change-Id: I02100232042f8b3a31414246e6231eb579139906
Issue-ID: VFC-1639
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
docker/docker-entrypoint.sh

index 624e3d3..8913667 100755 (executable)
@@ -34,8 +34,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