X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2FDockerfile.mariadb;h=6d2d6f2e2ba977a3017dc7be05d1630cb9e94a67;hb=99b982918fe3c9a33b0f221bdfafd7b710b9edb6;hp=2d79908a4a2126c1422ee423b83af58fe7271d09;hpb=f9b06313332d65f2a6600667d1b92c2ebede5453;p=portal.git

diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb
index 2d79908a..6d2d6f2e 100644
--- a/deliveries/Dockerfile.mariadb
+++ b/deliveries/Dockerfile.mariadb
@@ -1,21 +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 SDK_SCRIPT_DIR=${SDK_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_DIR}/EcompPortalDDLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompPortalDDLMySql_1610_Complete_OS.sql
-ADD ${SCRIPT_DIR}/EcompPortalDMLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1610_Complete_OS.sql
+# Scripts are executed in alphabetical order
 
-ADD ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompSdkDDLMySql_1610_Complete_OS.sql
-ADD ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompSdkDMLMySql_1610_Complete_OS.sql
+# Portal DDL and DML at v2.1
+COPY ${DB_SCRIPT_DIR}/PortalDDLMySql_2_1_Common.sql /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/PortalDDLMySql_2_1_OS.sql     /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/PortalDMLMySql_2_1_Common.sql /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/PortalDMLMySql_2_1_OS.sql     /docker-entrypoint-initdb.d/
+# Do not copy the onboarding script here; it's mounted as a volume
 
-ADD ${DBC_SCRIPT_DIR}/EcompSdkDDLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompDbcDDLMySql_1610_Complete_OS.sql
-ADD ${DBC_SCRIPT_DIR}/EcompSdkDMLMySql_1610_Complete_OS.sql docker-entrypoint-initdb.d/EcompDbcDMLMySql_1610_Complete_OS.sql
+# SDK App DDL and DML
+COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_2_2_Common.sql       /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_2_2_OS.sql           /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_2_2_Common.sql       /docker-entrypoint-initdb.d/
+COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_2_2_OS.sql           /docker-entrypoint-initdb.d/