summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-03-03 15:43:04 +0800
committerYan Yang <yangyanyj@chinamobile.com>2020-03-03 07:45:49 +0000
commit4c9693ce749d4d15d3fbba4cda0e4cf6eff888b1 (patch)
treec928bbd2fe1dd00c02edc8abad4d32385e0166cc
parentc81d0dd7a3345f2ed35805a9d84a719dc0703f54 (diff)
Modify DB initialization completion judgment flag1.3.7
Change-Id: Ic99f2b1fef441c2a8a90d53121ceb4a58a1bee01 Issue-ID: VFC-1639 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rwxr-xr-xmgr/docker/docker-entrypoint.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mgr/docker/docker-entrypoint.sh b/mgr/docker/docker-entrypoint.sh
index 3f290c9..8dd4bb8 100755
--- a/mgr/docker/docker-entrypoint.sh
+++ b/mgr/docker/docker-entrypoint.sh
@@ -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