diff options
| author |   Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-09-29 15:47:17 +0800 |
|---|---|---|
| committer | Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-09-29 15:47:17 +0800 |
| commit | dd259fbcf05d75c876c29a375371270518d0afc5 (patch) | |
| tree | b9f80da0dc080375d1c7713ff15fc2808a1409cf | |
| parent | dd52dc299229243fa34439cf8861dffd359e3e86 (diff) | |
Fix the docker build error for vfc-nfvo-wfengine
Change-Id: I8dc9d926e834ab3a0ca8ee9606e639edd386f88a
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.sh | 8 | ||||
| -rw-r--r-- | wfenginemgrservice/src/main/docker/Dockerfile | 5 |
2 files changed, 4 insertions, 9 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 7b81493..7b309d1 100644 --- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh +++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh @@ -49,18 +49,18 @@ echo "CURLPROXY=${CURLPROXY}" rm -Rf activiti-5.2.0/ rm -Rf apache-tomcat/ rm -Rf temp/ -#rm -Rf activiti-extension*.jar +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 @@ -72,7 +72,7 @@ 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 -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}" +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 diff --git a/wfenginemgrservice/src/main/docker/Dockerfile b/wfenginemgrservice/src/main/docker/Dockerfile index 7f302dd..f0bdb3a 100644 --- a/wfenginemgrservice/src/main/docker/Dockerfile +++ b/wfenginemgrservice/src/main/docker/Dockerfile @@ -11,8 +11,3 @@ RUN chmod 755 /home/onap/workflow/wfenginemgrservice/*.sh ENTRYPOINT ["./entrypoint.sh"] CMD ["start"] - - - - - |