Modify scripts renaming methods

Change-Id: I87aa34de1817c5060005dd4af7c1029e10a8fa79
Issu-Id: VFC-264
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>

diff --git a/docker/build_image.sh b/docker/build_image.sh
index 7969545..2a7943e 100755 (executable)
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -19,16 +19,16 @@ if [ $HTTPS_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
 fi
 
-function build_catalog {
+function build_image {
     echo "Start build docker image: ${IMAGE_NAME}"
     docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
 }
 
-function push_catalog {
+function push_image {
     echo "Start push docker image: ${IMAGE_NAME}"
     docker push ${IMAGE_NAME}:${VERSION}
     docker push ${IMAGE_NAME}:latest
 }
 
-build_catalog
-push_catalog
+build_image
+push_image

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 86f9566..f02c9cc 100755 (executable)
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -18,7 +18,7 @@ echo "MSB_ADDR=$MSB_ADDR"
 
 # Wait for MSB initialization
 echo "Wait for MSB initialization"
-for i in {1..20}; do
+for i in {1..5}; do
     curl -sS -m 1 $MSB_ADDR > /dev/null && break
     sleep $i
 done

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index b68e621..622477f 100755 (executable)
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -10,13 +10,8 @@ function start_redis_server {
 }
 
 function start_mysql {
-    su mysql -c /usr/bin/mysqld_safe &
     service mysql start
-    # Wait for mysql to initialize; Set mysql root password
-    for i in {1..10}; do
-        sleep $i
-        bash /usr/bin/mysqladmin -u root password $MYSQL_ROOT_PASSWORD &> /dev/null && break
-    done
+    sleep 1
 }
 
 function create_database {