X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2FDockerfile.mariadb;h=e9c5e9f311b9b0cb407f6303996a6955f941731e;hb=d7f3b463c9f0f11ceb0aad255f564b02c22ab978;hp=871637f54cb910561871f92a19a33dd5b635c937;hpb=627badaf69987c01811c477219fd943757a635f5;p=portal.git

diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb
index 871637f5..e9c5e9f3 100644
--- a/deliveries/Dockerfile.mariadb
+++ b/deliveries/Dockerfile.mariadb
@@ -1,28 +1,22 @@
 FROM mariadb:latest
 
-#Author
-MAINTAINER Manoop talasila@research.att.com 
+ARG DB_SCRIPT_DIR=${DB_SCRIPT_DIR}
 
-ARG SCRIPT_DIR=${SCRIPT_DIR}
-ARG SCRIPT_COMMON_DIR=${SCRIPT_COMMON_DIR}
-ARG SDK_SCRIPT_DIR=${SDK_SCRIPT_DIR}
-ARG SDK_COMMON_SCRIPT_DIR=${SDK_COMMON_SCRIPT_DIR}
-ARG DBC_COMMON_SCRIPT_DIR=${DBC_COMMON_SCRIPT_DIR}
-ARG DBC_SCRIPT_DIR=${DBC_SCRIPT_DIR}
+# constant
 #Add config file
-ADD my.cnf /etc/mysql/my.cnf
-#ADD cluster.cnf /etc/mysql/conf.d
+COPY my.cnf /etc/mysql/my.cnf
 
-#Add DDL and DML SQL files
-ADD ${SCRIPT_COMMON_DIR}/EcompPortalDDLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompPortalDDLMySql_1707_Common.sql
-ADD ${SCRIPT_DIR}/EcompPortalDDLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompPortalDDLMySql_1707_OS.sql
-ADD ${SCRIPT_COMMON_DIR}/EcompPortalDMLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1707_Common.sql
-ADD ${SCRIPT_DIR}/EcompPortalDMLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1707_OS.sql
+# Scripts are executed in alphabetical order
 
-ADD ${SDK_COMMON_SCRIPT_DIR}/EcompSdkDDLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompSdkDDLMySql_1707_Common.sql
-ADD ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompSdkDDLMySql_1707_OS.sql
-ADD ${SDK_COMMON_SCRIPT_DIR}/EcompSdkDMLMySql_1707_Common.sql docker-entrypoint-initdb.d/EcompSdkDMLMySql_1707_Common.sql
-ADD ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1707_OS.sql docker-entrypoint-initdb.d/EcompSdkDMLMySql_1707_OS.sql
+# Portal DDL and DML at v3.2
+COPY ${DB_SCRIPT_DIR}/PortalDDLMySql_3_2_Common.sql /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/PortalDDLMySql_3_2_OS.sql     /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/PortalDMLMySql_3_2_Common.sql /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/PortalDMLMySql_3_2_OS.sql     /docker-entrypoint-initdb.d/
+# Do not copy the onboarding script here; it's mounted as a volume
 
-# This file was built by os_build_febe.sh
-ADD ${DBC_SCRIPT_DIR}/dbca-complete-mysql-1707-os.sql docker-entrypoint-initdb.d/dbca-complete-mysql-1707-os.sql
+# SDK App DDL and DML
+COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_3_2_Common.sql       /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_3_2_OS.sql           /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_3_2_Common.sql       /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_3_2_OS.sql           /docker-entrypoint-initdb.d/