From: yangyan <yangyanyj@chinamobile.com>
Date: Fri, 28 Feb 2020 07:16:03 +0000 (+0800)
Subject: Change the value of the password after obtaining encryption and fix some typo error
X-Git-Tag: 1.3.7~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6a7f3524cd95b6b7af8452ff90ac7c150a284e37;p=vfc%2Fnfvo%2Fcatalog.git

Change the value of the password after obtaining encryption and fix some typo error

Change-Id: I542b38b407f3c545d651945323620863a977149a
Issue-ID: VFC-1600
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 12a67b7e..624e3d31 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -23,8 +23,8 @@ echo "MYSQL_ADDR=$MYSQL_ADDR"
 # Wait for MSB initialization
 echo "Wait for MSB initialization"
 for i in {1..5}; do
-    curl -sS -m 1 $MSB_PROTO:$MSB_ADDR/msb -k > /dev/null
-    res=$i?
+    curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null
+    res=$?
     if [ $res -ne 0 ]; then
         break
     fi
diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 03ea1d9e..828cbf5a 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -3,12 +3,12 @@
 MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
 MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2`
 
-if [ $MYSQL_AUTH ]; then
-    MYSQL_ROOT_USER=`echo $MYSQL_AUTH | cut -d: -f 1`
-    MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2`
+if [ $MYSQL_ROOT_USER ] && [ $MYSQL_ROOT_PASSWORD ]; then
+     MYSQL_ROOT_USER=$MYSQL_ROOT_USER
+     MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
 else
-    MYSQL_ROOT_USER="root"
-    MYSQL_ROOT_PASSWORD="root"
+     MYSQL_ROOT_USER="root"
+     MYSQL_ROOT_PASSWORD="root"
 fi
 
 function create_database {