Merge "Fix docker ENTRYPOINT script"

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 16738ac..3a309f7 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_config.sh b/docker/instance_config.sh
index 1fc5eda..06e0d02 100755 (executable)
--- a/docker/instance_config.sh
+++ b/docker/instance_config.sh
@@ -31,7 +31,7 @@ sed -i "s|DB_PASSWD.*|DB_PASSWD = 'vfcnfvolcm'|" vfc/nfvo/lcm/lcm/pub/config/con
 
 # Configure MYSQL
 if [ -z "$MYSQL_ADDR" ]; then
-    export MYSQL_IP=127.0.0.1
+    export MYSQL_IP=`hostname -i`
     export MYSQL_PORT=3306
     export MYSQL_ADDR=$MYSQL_IP:$MYSQL_PORT
 else

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index f758a71..f5a5054 100755 (executable)
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -10,13 +10,9 @@ 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
+    sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf
+    service mysql restart
+    sleep 1
 }
 
 function create_database {