Update dockerfile of vfc-gvnfm-vnflcm

[vfc/gvnfm/vnflcm.git] / lcm / docker / instance_init.sh

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index ecf9e86..f33294d 100755 (executable)
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -9,7 +9,13 @@ 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
 }
 
 function create_database {
@@ -17,23 +23,7 @@ function create_database {
     bash initDB.sh root $MYSQL_ROOT_PASSWORD 3306 127.0.0.1
 }
 
-function edit_configs {
-    cd /service/vfc/gvnfm/vnflcm/lcm/docker
-    bash instance_config.sh
-}
-
-function start_server {
-    cd /service/vfc/gvnfm/vnflcm/lcm
-    bash run.sh
-}
-
-if [ $MYSQL_ROOT_PASSWORD ]; then
-    install_python_libs
-    start_redis_server
-    start_mysql
-    create_database
-    edit_configs
-    start_server
-else
-    echo "MYSQL_ROOT_PASSWORD environment variable not set."
-fi
+install_python_libs
+start_redis_server
+start_mysql
+create_database