X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Fdocker-entrypoint.sh;h=05b094af2622a46dbb9cb8f80a276cf6f3ed8465;hb=7a0c2aa47bc5297a7977e7b7d1a362768efa1e17;hp=b6b09a5ffd9062ede799920e574153a562c4ebe9;hpb=18e83bdb36453f4fe09bc0395597125302ad47f7;p=modeling%2Fetsicatalog.git

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index b6b09a5..05b094a 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -11,33 +11,40 @@ if [ -z "$MSB_ADDR" ]; then
 fi
 echo "MSB_ADDR=$MSB_ADDR"
 
-if [ -z "$MYSQL_ADDR" ]; then
-    echo "Missing required variable MYSQL_ADDR: <ip>:<port>"
-    exit 1
+# Configure config file based on  environment variables
+
+python modeling/etsicatalog/catalog/pub/config/config.py
+cat modeling/etsicatalog/catalog/pub/config/config.py
+
+# microservice-specific one-time initialization
+
+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
-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_ADDR > /dev/null && break
-    sleep $i
-done
+function create_database {
 
-# Wait for DB initialization
-echo "Wait for DB initialization"
-for i in {1..5}; do
-    curl -sS -m 1 $MYSQL_ADDR > /dev/null && break
-    sleep $i
-done
+    cd /service/modeling/etsicatalog/resources/bin
+    bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP
 
-# Configure service based on docker environment variables
-modeling/etsicatalog/docker/instance_config.sh
+ }
 
-# microservice-specific one-time initialization
-modeling/etsicatalog/docker/instance_init.sh
+function migrate_database {
+    cd /service/modeling/etsicatalog
+    python manage.py migrate
+}
+
+create_database
+migrate_database
 
-date > init.log
+date > /service/init.log
 
 # Start the microservice
-modeling/etsicatalog/docker/instance_run.sh
+/service/modeling/etsicatalog/docker/instance_run.sh