From dd52dc299229243fa34439cf8861dffd359e3e86 Mon Sep 17 00:00:00 2001 From: Zhaoxing Date: Fri, 29 Sep 2017 14:09:19 +0800 Subject: Fix the docker build error for vfc-nfvo-wfengine Change-Id: I976ba9df7fb7145563df31f1e6ee3449279fe382 Issue-id: VFC-445 Signed-off-by: Zhaoxing --- .../src/main/docker/activiti-docker-build_image.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to '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 bc53fbd..7b81493 100644 --- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh +++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh @@ -46,33 +46,42 @@ if [ $https_proxy ]; then fi echo "CURLPROXY=${CURLPROXY}" +rm -Rf activiti-5.2.0/ +rm -Rf apache-tomcat/ +rm -Rf temp/ +#rm -Rf activiti-extension*.jar +rm -Rf activiti-rest.war + + echo "download Tomcat 8.5.20" #curl "${CURLPROXY}" -m 300 -O -J -L "http://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz" -wget "http://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz" +#wget "http://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz" tar -zxf apache-tomcat-8.5.20.tar.gz mv apache-tomcat-8.5.20 apache-tomcat echo "download Activiti 5.22.0" -wget "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/ #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 ./ +#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 600 -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}" -wget --output-file=activiti-extension.jar "https://nexus.onap.org/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 "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 echo "update activiti-rest.war" -$JAVA_HOME/bin/jar uvf activiti-rest.war -C ./temp . >/dev/null 2>&1 +$JAVA_HOME/bin/jar -uvf activiti-rest.war -C ./temp/ ./ +#. >/dev/null 2>&1 -C ./temp cp activiti-rest.war ./apache-tomcat/webapps/ +cp -Rf bin/* ./apache-tomcat/bin function build_image { echo "Start build docker image: ${IMAGE_NAME}" -- cgit 1.2.3-korg