summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaoxing <meng.zhaoxing1@zte.com.cn>2018-03-27 13:35:12 +0800
committerZhaoxing <meng.zhaoxing1@zte.com.cn>2018-03-27 13:35:12 +0800
commit02df4de70fffc6ecc52e9c23168e43803e510371 (patch)
treebfbab27febdc5adb6d1c28642a370dd90913bfb4
parent16520cde5a149f6b164b433fa06f1a5aa3b8b7e1 (diff)
Fix wfengine docker build issue
Change-Id: Ib8827694b5991be946048556c387d71fc73b31d4 Issue-ID: VFC-851 Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
-rw-r--r--activiti-extension/src/main/docker/activiti-docker-build_image.sh2
-rw-r--r--wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh2
2 files changed, 2 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 4dfa0de..077eac7 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -104,7 +104,7 @@ mv activiti-5.22.0/wars/activiti-rest.war .
echo "download activiti-extension ${VERSION}"
#curl "${CURLPROXY}" -m 600 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
#wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
-wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=1.0.0-SNAPSHOT"
+wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}-SNAPSHOT"
rm -Rf ./temp/
mkdir -p ./temp/WEB-INF/lib/
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index c3d321e..2a45665 100644
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -77,7 +77,7 @@ rm -f ./bin/workflow-engine-mgr-service*.jar
echo "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" LATEST
#curl "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
#wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
-wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=1.0.0-SNAPSHOT"
+wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}-SNAPSHOT"
mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar
function build_image {