From: dengyh <dengyuanhong@chinamobile.com>
Date: Mon, 10 Aug 2020 01:41:48 +0000 (+0800)
Subject: Optimize container image about create database and docker_entrypoint
X-Git-Tag: 1.0.7~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=modeling%2Fetsicatalog.git;a=commitdiff_plain;h=b56448fa7f0faeffb79541164f8c9bd3983d05ab

Optimize container image about create database and docker_entrypoint

Issue-ID: MODELING-413
Change-Id: I6fb9d9d6c2872d22b71fe42776de03475da4a30c
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
---

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 <ip>:<port>"
-    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
diff --git a/resources/bin/initDB.sh b/resources/bin/initDB.sh
deleted file mode 100755
index 85b61d9..0000000
--- a/resources/bin/initDB.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 ZTE Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-DIRNAME=`dirname $0`
-HOME=`cd $DIRNAME/; pwd`
-MYSQL_USER=$1
-MYSQL_PASSWORD=$2
-MYSQL_PORT=$3
-MYSQL_IP=$4
-echo "start create etsicatalog db"
-sql_path=$HOME/../
-mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP <$sql_path/dbscripts/mysql/modeling-etsicatalog-createdb.sql
-sql_result=$?
-if [ $sql_result -ne 0 ] ; then
-    echo "Failed to create etsicatalog database"
-    exit 1
-else
-    echo "Create etsicatalog database successfully"
-    exit 0
-fi
-
diff --git a/resources/dbscripts/mysql/modeling-etsicatalog-createdb.sql b/resources/dbscripts/mysql/modeling-etsicatalog-createdb.sql
deleted file mode 100644
index c6a71ab..0000000
--- a/resources/dbscripts/mysql/modeling-etsicatalog-createdb.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Copyright 2018 ZTE Corporation.
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
-
-/******************create database and user***************************/
-use mysql;
-
-create database if not exists etsicatalog CHARACTER SET utf8;
-
-
-GRANT ALL PRIVILEGES ON etsicatalog.* TO 'etsicatalog'@'%' IDENTIFIED BY 'etsicatalog' WITH GRANT OPTION;
-GRANT ALL PRIVILEGES ON mysql.* TO 'etsicatalog'@'%' IDENTIFIED BY 'etsicatalog' WITH GRANT OPTION;
-
-GRANT ALL PRIVILEGES ON etsicatalog.* TO 'etsicatalog'@'localhost' IDENTIFIED BY 'etsicatalog' WITH GRANT OPTION;
-GRANT ALL PRIVILEGES ON mysql.* TO 'etsicatalog'@'localhost' IDENTIFIED BY 'etsicatalog' WITH GRANT OPTION;
-FLUSH PRIVILEGES;