X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Fdocker-entrypoint.sh;h=528492b2c003a7b3e97b62a57007ca9485be5f6f;hb=fe7fa3746a2c1085527b2355b59cab3dc37229e7;hp=8666f69fa5c81207c38bf39d3cbd597ead813f9a;hpb=5fd2ae6a4517980ce0f89247bb354220748ae67b;p=modeling%2Fetsicatalog.git

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 8666f69..528492b 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,46 +1,19 @@
 #!/bin/bash
 
-sudo chown onap:onap -R /service
-find  /service -name '*.sh'|xargs chmod a+x
+# Configure config file based on  environment variables
 
-if [ -z "$SERVICE_IP" ]; then
-    export SERVICE_IP=`hostname -i`
-fi
-echo "SERVICE_IP=$SERVICE_IP"
+python modeling/etsicatalog/catalog/pub/config/config.py
+cat modeling/etsicatalog/catalog/pub/config/config.py
 
-if [ -z "$MSB_ADDR" ]; then
-    echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>"
-    exit 1
-fi
-echo "MSB_ADDR=$MSB_ADDR"
+function migrate_database {
+    cd /service/modeling/etsicatalog
+    python manage.py makemigrations
+    python manage.py migrate
+}
 
-if [ -z "$MYSQL_ADDR" ]; then
-    echo "Missing required variable MYSQL_ADDR: <ip>:<port>"
-    exit 1
-fi
-echo "MYSQL_ADDR=$MYSQL_ADDR"
+migrate_database
 
-# 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
-
-# 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
-
-# Configure service based on docker environment variables
-modeling/etsicatalog/docker/instance_config.sh
-
-# microservice-specific one-time initialization
-modeling/etsicatalog/docker/instance_init.sh
-
-date > init.log
+date > /service/init.log
 
 # Start the microservice
-modeling/etsicatalog/docker/instance_run.sh
+/service/modeling/etsicatalog/docker/instance_run.sh