diff options
| author |   statta <statta@research.att.com> | 2017-05-17 08:08:49 -0400 |
|---|---|---|
| committer | statta <statta@research.att.com> | 2017-05-17 08:08:49 -0400 |
| commit | ba838f2e13f1e8050c75e68bd3733d56d8f416d5 (patch) | |
| tree | 4a5ae926f99de3f12925a5d1f42ce1a7d33eae05 | |
| parent | 6a62e917a5f9f6a69fe8e1f56c29abd9d98cba37 (diff) | |
[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>
| -rw-r--r-- | deliveries/createMaria.sh | 2 | ||||
| -rw-r--r-- | deliveries/os_settings.sh | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh index ab053c21..6b70adff 100644 --- 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 081d9c64..d4ab1853 100644 --- 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 |