diff options
| author |   Murali Mohan Murthy Potham <murali.p@huawei.com> | 2017-09-19 05:34:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-19 05:34:47 +0000 |
| commit | 6ad6a306b317fd8d8408b49c5cd653a55e344352 (patch) | |
| tree | 0162058aa446230c8e766eb577552bceee79d4ee | |
| parent | d56039a829375bb42d05f023a2972b92e638a144 (diff) | |
| parent | 88fa599e5ea22b09dddbb60543fa89543f9253c8 (diff) | |
Merge "Remove sql configuration from docke files"
| -rwxr-xr-x | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh | 7 | ||||
| -rwxr-xr-x | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh | 5 |
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 |