diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-09-27 08:41:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-27 08:41:47 +0000 |
| commit | 9c0066ba8c115701e9f03e0868f99b38ab4ea1c9 (patch) | |
| tree | b80b66fc961266168a45c29aa33fa5e6b4b28119 | |
| parent | 457d0a5c67673d16d74cb46c2cbac7e5cb0dd0ca (diff) | |
| parent | 80bcd01c40d775ba3773ecd41fa1589b407e1489 (diff) | |
Merge "Fix the docker build error for vfc-nfvo-wfengine"
| -rw-r--r-- | activiti-extension/src/main/docker/activiti-docker-build_image.sh | 10 |
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 { |