Fix the docker build error for vfc-nfvo-wfengine

[vfc/nfvo/wfengine.git] / activiti-extension / src / main / docker / activiti-docker-build_image.sh

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 653dc7f..577b365 100644 (file)
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -10,7 +10,7 @@ ORG="onap"
 # VERSION="1.0.0"
 VERSION="1.0.0-SNAPSHOT"
 PROJECT="vfc"
-IMAGE="activiti-wfengine"
+IMAGE="wfengine-activiti"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 
@@ -53,17 +53,24 @@ tar -zxf apache-tomcat-8.5.20.tar.gz
 mv apache-tomcat-8.5.20 apache-tomcat
 
 echo "download Activiti 5.22.0"
-curl "${CURLPROXY}" -m 300 -O -J -L  "https://github.com/Activiti/Activiti/releases/download/activiti-5.22.0/activiti-5.22.0.zip"
+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/
-unzip activiti-5.22.0.zip "activiti-5.22.0/wars/activiti-rest.war" -d ./
+#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 "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 {