diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2018-08-08 14:03:17 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-08-08 14:11:14 +0800 |
| commit | 35b5bb6b423691ed1819732bae4e41864112810e (patch) | |
| tree | 452fde436a5688e77c802f4bcc469bfd6e034539 /docker/docker-entrypoint.sh | |
| parent | 007bfac568467b36154cb9cf43f83b38ad0e17d2 (diff) | |
Remove DB and redis service from catalog
Change-Id: I55361edccd5464702e828975694017b27a4f4f79
Issue-ID: VFC-978
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'docker/docker-entrypoint.sh')
| -rwxr-xr-x | docker/docker-entrypoint.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index f02c9cce..0a277fae 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -5,17 +5,18 @@ if [ -z "$SERVICE_IP" ]; then fi echo "SERVICE_IP=$SERVICE_IP" -if [ -z "$MYSQL_ROOT_PASSWORD" ]; then - export MYSQL_ROOT_PASSWORD="root" -fi -echo "MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD" - if [ -z "$MSB_ADDR" ]; then echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>" exit 1 fi echo "MSB_ADDR=$MSB_ADDR" +if [ -z "$MYSQL_ADDR" ]; then + echo "Missing required variable MYSQL_ADDR: <ip>:<port>" + exit 1 +fi +echo "MYSQL_ADDR=$MYSQL_ADDR" + # Wait for MSB initialization echo "Wait for MSB initialization" for i in {1..5}; do @@ -23,6 +24,13 @@ for i in {1..5}; do sleep $i 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 +done + # Configure service based on docker environment variables vfc/nfvo/catalog/docker/instance_config.sh |