From: Lusheng Ji <lji@research.att.com>
Date: Tue, 12 Sep 2017 20:26:58 +0000 (+0000)
Subject: Change to call docker build script
X-Git-Tag: v1.1.4~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=aad6210043e4eae1879ac8f611c8531a1a3271d9;p=dcaegen2%2Fcollectors%2Fves.git

Change to call docker build script

Issue-Id: DCAEGEN2-60
Change-Id: Ic6763e7220e4e315ee9141581e75c93a673cf030
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 309e8411..9603bb4d 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -28,6 +28,10 @@ MVN_PHASE="$2"
 
 
 PROJECT_ROOT=$(dirname $0)
+if [ -z "$WORKSPACE" ]; then
+  export WORKSPACE="$PROJECT_ROOT"
+fi
+
 
 FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}"
 if [ "$MVN_PROJECT_MODULEID" == "__" ]; then
@@ -114,8 +118,15 @@ install)
 deploy)
   echo "==> deploy phase script"
   # build docker image from Docker file (under root of repo) and push to registry
-  build_and_push_docker
-
+  #build_and_push_docker
+  case $MVN_DEPLOYMENT_TYPE in
+  SNAPSHOT)
+    bash docker-build.sh merge
+    ;;
+  STAGING)
+    bash docker-build.sh release
+    ;;
+  esac 
   ;;
 *)
   echo "==> unprocessed phase"