From: Zhaoxing Date: Wed, 27 Sep 2017 08:13:58 +0000 (+0800) Subject: Fix the docker build error for vfc-nfvo-wfengine X-Git-Tag: v1.0.0~38^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=80bcd01c40d775ba3773ecd41fa1589b407e1489;p=vfc%2Fnfvo%2Fwfengine.git Fix the docker build error for vfc-nfvo-wfengine Change-Id: I090c39ef6062c01bb68ca85ef78ef0d0a9d6dc0b Issue-id: VFC-445 Signed-off-by: Zhaoxing --- 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 {