From: Zhaoxing <meng.zhaoxing1@zte.com.cn>
Date: Wed, 4 Apr 2018 01:54:24 +0000 (+0800)
Subject: Fix wfengine docker build issue
X-Git-Tag: v1.1.0^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=487dbdf729b04aa77c839f1f077b776e7d00bbd6;p=vfc%2Fnfvo%2Fwfengine.git

Fix wfengine docker build issue

Change-Id: Iaddace72f28f1484b15c8277422a5c8f92ebf13e
Issue-ID: VFC-851
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
---

diff --git a/activiti-extension/src/main/docker/activiti-docker-build_image.sh b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
index 077eac7..367a31f 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -8,7 +8,7 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 ORG="onap"
 # VERSION="1.0.0"
-DOCKER_VER="1.0.0"
+DOCKER_VER="1.1.0"
 VERSION="${DOCKER_VER}-SNAPSHOT"
 PROJECT="vfc"
 IMAGE="wfengine-activiti"
@@ -48,6 +48,7 @@ pwd
 #echo "0VERSION=${VERSION}"
 VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)
 echo "VERSION=${VERSION}"
+DOCKER_VER=${VERSION}
 
 cd ${DOCKER_BUILD_DIR}
 if [[ $VERSION != *-SNAPSHOT ]]; then
diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index 2a45665..4312a13 100644
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -8,7 +8,7 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 ORG="onap"
 # VERSION="1.0.0"
-DOCKER_VER="1.0.0"
+DOCKER_VER="1.1.0"
 VERSION="${DOCKER_VER}-SNAPSHOT"
 PROJECT="vfc"
 IMAGE="wfengine-mgrservice"
@@ -46,6 +46,8 @@ echo "mvncmd=${mvncmd}"
 pwd
 VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)
 echo "VERSION=${VERSION}"
+DOCKER_VER=${VERSION}
+
 
 cd ${DOCKER_BUILD_DIR}
 if [[ $VERSION != *-SNAPSHOT ]]; then