[Docker Build] Updated Docker build

The changes have been performed in the build script to align with
Rebased code

Change-Id: Idedd7d9b10124af2a523349fc8d9744e8ea06fd8
Signed-off-by: statta <statta@research.att.com>

diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh
index ab053c2..6b70adf 100644 (file)
--- a/deliveries/createMaria.sh
+++ b/deliveries/createMaria.sh
@@ -4,4 +4,4 @@ source $(dirname $0)/os_settings.sh
 echo ${SCRIPT_DIR}
 
 
-docker build -t ecompdb:portal --build-arg SCRIPT_DIR="${SCRIPT_DIR}" --build-arg SDK_SCRIPT_DIR="${SDK_SCRIPT_DIR}" --build-arg DBC_SCRIPT_DIR="${DBC_SCRIPT_DIR}" -f ./Dockerfile.mariadb .
+docker build -t ecompdb:portal --build-arg SCRIPT_DIR="${SCRIPT_DIR}" --build-arg SDK_SCRIPT_DIR="${SDK_SCRIPT_DIR}" --build-arg DBC_SCRIPT_DIR="${DBC_SCRIPT_DIR}" --build-arg SCRIPT_COMMON_DIR="${SCRIPT_COMMON_DIR}" --build-arg SDK_COMMON_SCRIPT_DIR="${SDK_COMMON_SCRIPT_DIR}" --build-arg DBC_COMMON_SCRIPT_DIR="${DBC_COMMON_SCRIPT_DIR}" -f ./Dockerfile.mariadb .

diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh
index 081d9c6..d4ab185 100644 (file)
--- a/deliveries/os_settings.sh
+++ b/deliveries/os_settings.sh
@@ -1,11 +1,14 @@
 IMGNAME=ep:1610-1
-VERSION=1.0.0
+VERSION=1.1.0-SNAPSHOT
 ETCDIR=etc
 WORKINGDIR=PROJECT
-SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-BE/target/ecompportal
-FE_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-FE
-SCRIPT_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-BE/ecomp-portal-resources/sql scripts"
-SDK_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/db-scripts
-DBC_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/db-scripts
-PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/target/ep-sdk-app
-PORTAL_DBC_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/target/ep-dbc-app
+SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-BE-os/target/ecompportal-be-os
+FE_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-FE-os
+SCRIPT_COMMON_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-DB-common/"
+SCRIPT_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-DB-os/"
+SDK_COMMON_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-common/db-scripts
+SDK_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/db-scripts
+DBC_COMMON_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-common/db-scripts
+DBC_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-os/db-scripts
+PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/target/ep-sdk-app
+PORTAL_DBC_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-os/target/ep-dbc-app