Don't modify the config file with sed in the docker entrypoint script

[vfc/nfvo/lcm.git] / docker / instance_init.sh

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 3c0dcce..a19e1ce 100755 (executable)
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -1,21 +1,27 @@
-#!/bin/bash
+#/bin/bash
 
-function start_redis_server {
-    redis-server &
-}
 
-function start_mysql {
-    sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf
-    service mysql restart
-    sleep 1
-}
+MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1`
+MYSQL_PORT=`echo $MYSQL_ADDR | 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"
+fi
 
 function create_database {
     cd /service/vfc/nfvo/lcm/resources/bin
-    bash initDB.sh root $MYSQL_ROOT_PASSWORD 3306 127.0.0.1
-    cd /service
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
+}
+
+function migrate_database {
+    cd /service/vfc/nfvo/lcm
+    python manage.py migrate
 }
 
-start_redis_server
-start_mysql
 create_database
+migrate_database
+