aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali <murali.p@huawei.com>2017-09-19 04:45:09 +0000
committerMurali <murali.p@huawei.com>2017-09-19 04:45:09 +0000
commit88fa599e5ea22b09dddbb60543fa89543f9253c8 (patch)
tree667af798146e8fc5da33bfb4e09f4e28883309d8
parentbc3841316a5945d91e8782e8713c091d4b48eb4a (diff)
Remove sql configuration from docke files
Change-Id: I44bbb0f50555d37fcaa256182f709c6a2a2b0ec8 Jira:VNFSDK-78 Signed-off-by: Murali <murali.p@huawei.com>
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh7
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh5
2 files changed, 1 insertions, 11 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh
index 4dba1a4f..df6cfce9 100755
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh
@@ -37,10 +37,6 @@ echo
# Configure service based on docker environment variables
./instance-config.sh
-# Start mysql
-chown -R mysql /var/lib/mysql
-chgrp -R mysql /var/lib/mysql
-su mysql -c /usr/bin/mysqld_safe &
# Perform one-time config
@@ -48,8 +44,7 @@ if [ ! -e init.log ]; then
# Perform workarounds due to defects in release binary
./instance-workaround.sh
- # Init mysql; set root password
- ./init-mysql.sh
+
# microservice-specific one-time initialization
./instance-init.sh
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh
index f052db2a..697eaded 100755
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh
@@ -15,11 +15,6 @@
# limitations under the License.
#
-# Initialize DB schema
-mysql -uroot -prootpass < init/marketplace_tables_mysql.sql
-
-# Set mysql password
-sed -i 's|Changeme_123|rootpass|' webapps/ROOT/WEB-INF/classes/mybatis/configuration/configuration.xml
#Set postgres instance IP
sed -i 's|127.0.0.1|'"$POSTGRES_IP"'|' webapps/ROOT/WEB-INF/classes/mybatis/configuration/configuration.xml