diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2018-04-04 02:09:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-04 02:09:00 +0000 |
| commit | f97fb33196593dcde638c0176bea85789946a326 (patch) | |
| tree | 10ffcc1698d804e32ca545672d49e9a3c1a95139 | |
| parent | a915cce776fc4094c0cb20840a783389d9951067 (diff) | |
| parent | 487dbdf729b04aa77c839f1f077b776e7d00bbd6 (diff) | |
Merge "Fix wfengine docker build issue"v1.1.02.0.0-ONAPbeijing2.0.0-ONAP
| -rw-r--r-- | activiti-extension/src/main/docker/activiti-docker-build_image.sh | 3 | ||||
| -rw-r--r-- | wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh | 4 |
2 files changed, 5 insertions, 2 deletions
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 |