summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaoxing <meng.zhaoxing1@zte.com.cn>2017-09-27 16:13:58 +0800
committerZhaoxing <meng.zhaoxing1@zte.com.cn>2017-09-27 16:13:58 +0800
commit80bcd01c40d775ba3773ecd41fa1589b407e1489 (patch)
treece86c0652078e1ce0163266dcf6f7538298750df
parent3718440203047ebe3734e3e75136d3f9b5c09b18 (diff)
Fix the docker build error for vfc-nfvo-wfengine
Change-Id: I090c39ef6062c01bb68ca85ef78ef0d0a9d6dc0b Issue-id: VFC-445 Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
-rw-r--r--activiti-extension/src/main/docker/activiti-docker-build_image.sh10
1 files changed, 6 insertions, 4 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 1f60dd3..577b365 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -56,19 +56,21 @@ echo "download Activiti 5.22.0"
wget "https://github.com/Activiti/Activiti/releases/download/activiti-5.22.0/activiti-5.22.0.zip"
#curl "${CURLPROXY}" -m 600 -O -J -L "https://github.com/Activiti/Activiti/releases/download/activiti-5.22.0/activiti-5.22.0.zip"
rm -Rf ./activiti-5.22.0/
-sudo apt-get install p7zip-full
-7za x activiti-5.22.0.zip
+#sudo apt-get install p7zip-full
+#7za x activiti-5.22.0.zip
-#unzip -o -q activiti-5.22.0.zip
+unzip -o -q activiti-5.22.0.zip
#unzip -o -q activiti-5.22.0.zip "activiti-5.22.0/wars/activiti-rest.war" -d ./
mv activiti-5.22.0/wars/activiti-rest.war .
+echo "download activiti-extension ${VERSION}"
curl "${CURLPROXY}" -m 300 -O -J -L "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
rm -Rf ./temp/
mkdir -p ./temp/WEB-INF/lib/
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
-$JAVA_HOME/bin/jar uvf activiti-rest.war -C ./temp .
+echo "update activiti-rest.war"
+$JAVA_HOME/bin/jar uvf activiti-rest.war -C ./temp . >/dev/null 2>&1
cp activiti-rest.war ./apache-tomcat/webapps/
function build_image {