From b56448fa7f0faeffb79541164f8c9bd3983d05ab Mon Sep 17 00:00:00 2001 From: dengyh Date: Mon, 10 Aug 2020 09:41:48 +0800 Subject: Optimize container image about create database and docker_entrypoint Issue-ID: MODELING-413 Change-Id: I6fb9d9d6c2872d22b71fe42776de03475da4a30c Signed-off-by: dengyh --- docker/docker-entrypoint.sh | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'docker/docker-entrypoint.sh') diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 05b094a..528492b 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,47 +1,16 @@ #!/bin/bash -if [ -z "$SERVICE_IP" ]; then - export SERVICE_IP=`hostname -i` -fi -echo "SERVICE_IP=$SERVICE_IP" - -if [ -z "$MSB_ADDR" ]; then - echo "Missing required variable MSB_ADDR: Microservices Service Bus address :" - exit 1 -fi -echo "MSB_ADDR=$MSB_ADDR" - # 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 - -function create_database { - - cd /service/modeling/etsicatalog/resources/bin - bash initDB.sh $MYSQL_ROOT_USER $MYSQL_ROOT_PASSWORD $MYSQL_PORT $MYSQL_IP - - } - function migrate_database { cd /service/modeling/etsicatalog + python manage.py makemigrations python manage.py migrate } -create_database migrate_database date > /service/init.log -- cgit