summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaoxing <meng.zhaoxing1@zte.com.cn>2018-10-11 16:16:15 +0800
committerZhaoxing <meng.zhaoxing1@zte.com.cn>2018-10-11 16:25:30 +0800
commit6cb2387d1dd5f26748f67d1c743d88251c35b773 (patch)
treee34e9fe80c350923895f155b8af759f56fbe49eb
parent7d5d2073e171d904599c28f4126a7ed4ec5e1751 (diff)
Fix wfengine docker build issue3.0.1-ONAP1.2.0
Issue-ID: VFC-851 Change-Id: I24da7a61402d692a44dbaf31e1e257f18f5a112c Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
-rw-r--r--activiti-extension/src/main/docker/activiti-docker-build_image.sh39
-rw-r--r--wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh8
2 files changed, 38 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 7d0e8a1..f07193f 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -52,7 +52,7 @@ DOCKER_VER=${VERSION}
cd ${DOCKER_BUILD_DIR}
if [[ $VERSION != *-SNAPSHOT ]]; then
- NEXUSREPONAME="releases"
+ NEXUSREPONAME="staging"
else
NEXUSREPONAME="snapshots"
fi
@@ -87,12 +87,21 @@ cp -Rf ./Dockerfile ./build
echo "download Tomcat 8.5.23"
#curl "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/content/repositories/central/org/apache/tomcat/tomcat/8.5.23/tomcat-8.5.23.tar.gz"
-wget "${NEXUS_REPOS_URL}/content/repositories/central/org/apache/tomcat/tomcat/8.5.23/tomcat-8.5.23.tar.gz"
+for i in {1..10}; do
+ wget "${NEXUS_REPOS_URL}/content/repositories/central/org/apache/tomcat/tomcat/8.5.23/tomcat-8.5.23.tar.gz" && break
+ echo sleep $i
+ sleep $i
+done
tar -zxf tomcat-8.5.23.tar.gz
mv apache-tomcat-8.5.23 ./build/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"
+for i in {1..10}; do
+ wget "https://github.com/Activiti/Activiti/releases/download/activiti-5.22.0/activiti-5.22.0.zip" && break
+ echo sleep $i
+ sleep $i
+done
+
#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
@@ -106,7 +115,11 @@ echo "download activiti-extension ${VERSION}"
#curl "${CURLPROXY}" -m 600 -O -J -L "${NEXUS_REPOS_URL}/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 "${NEXUS_REPOS_URL}/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 "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}-SNAPSHOT"
-wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
+for i in {1..10}; do
+ wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}" && break
+ echo sleep $i
+ sleep $i
+done
rm -Rf ./temp/
mkdir -p ./temp/WEB-INF/lib/
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
@@ -114,15 +127,27 @@ cp -f swagger.json ./temp/
echo "download jackson-annotations 2.5.1"
-wget -O jackson-annotations-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-annotations&e=jar&v=2.5.1"
+for i in {1..10}; do
+ wget -O jackson-annotations-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-annotations&e=jar&v=2.5.1" && break
+ echo sleep $i
+ sleep $i
+done
cp -f jackson-annotations-2.2.3.jar ./temp/WEB-INF/lib/jackson-annotations-2.2.3.jar
echo "download jackson-core 2.5.1"
-wget -O jackson-core-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/redirect?r=central&g=com.fasterxml.jackson.core&a=jackson-core&e=jar&v=2.5.1"
+for i in {1..10}; do
+ wget -O jackson-core-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/redirect?r=central&g=com.fasterxml.jackson.core&a=jackson-core&e=jar&v=2.5.1" && break
+ echo sleep $i
+ sleep $i
+done
cp -f jackson-core-2.2.3.jar ./temp/WEB-INF/lib/jackson-core-2.2.3.jar
echo "download jackson-databind 2.5.1"
-wget -O jackson-databind-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-databind&e=jar&v=2.5.1"
+for i in {1..10}; do
+ wget -O jackson-databind-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-databind&e=jar&v=2.5.1" && break
+ echo sleep $i
+ sleep $i
+done
cp -f jackson-databind-2.2.3.jar ./temp/WEB-INF/lib/jackson-databind-2.2.3.jar
echo "update activiti-rest.war"
diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index ebb2c94..1225740 100644
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -51,7 +51,7 @@ DOCKER_VER=${VERSION}
cd ${DOCKER_BUILD_DIR}
if [[ $VERSION != *-SNAPSHOT ]]; then
- NEXUSREPONAME="releases"
+ NEXUSREPONAME="staging"
else
NEXUSREPONAME="snapshots"
fi
@@ -80,7 +80,11 @@ echo "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/
#curl "${CURLPROXY}" -m 300 -O -J -L "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
#wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
#wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}-SNAPSHOT"
-wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
+for i in {1..10}; do
+ wget -O workflow-engine-mgr-service.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" && break
+ echo sleep $i
+ sleep $i
+done
mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar