diff options
author | 2017-10-11 17:05:42 +0800 | |
---|---|---|
committer | 2017-10-11 17:05:42 +0800 | |
commit | f55132f49d1dbe3bd24924a7edbcbd6ba6e16704 (patch) | |
tree | 10087d7d332ef995b4584940a945c43a54da413f | |
parent | 3cdda39ed8b4f10b9e0fcb9900acf09d426ccffc (diff) |
Fix the docker build error for vfc-nfvo-wfengine
Change-Id: I40eef979522ec2eac5913e1544e98d3a1d00aa3f
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
4 files changed, 84 insertions, 78 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 7ed9f7f..51c523c 100644 --- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh +++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh @@ -16,8 +16,8 @@ IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" POM_DIR="../../../" cd ${POM_DIR} -# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo) -# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate) +VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo) +#VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate) echo "VERSION=${VERSION}" cd ${DOCKER_BUILD_DIR} @@ -49,15 +49,17 @@ echo "CURLPROXY=${CURLPROXY}" rm -Rf activiti-5.2.0/ rm -Rf apache-tomcat/ rm -Rf temp/ +rm -Rf build/ rm -Rf activiti-extension*.jar rm -Rf activiti-rest.war - +mkdir build +cp -Rf ./Dockerfile ./build echo "download Tomcat 8.5.23" #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://repo1.maven.org/maven2/org/apache/tomcat/tomcat/8.5.23/tomcat-8.5.23.tar.gz" tar -zxf tomcat-8.5.23.tar.gz -mv apache-tomcat-8.5.23 apache-tomcat +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" @@ -80,12 +82,12 @@ 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 -C ./temp -cp activiti-rest.war ./apache-tomcat/webapps/ -cp -Rf bin/* ./apache-tomcat/bin +cp activiti-rest.war ./build/apache-tomcat/webapps/ +cp -Rf bin/* ./build/apache-tomcat/bin function build_image { echo "Start build docker image: ${IMAGE_NAME}" - docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest . + docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest ./build } function push_image { diff --git a/activiti-extension/src/main/docker/bin/entrypoint.sh b/activiti-extension/src/main/docker/bin/entrypoint.sh index 7c5af09..eb384d9 100644 --- a/activiti-extension/src/main/docker/bin/entrypoint.sh +++ b/activiti-extension/src/main/docker/bin/entrypoint.sh @@ -27,11 +27,13 @@ echo "MSB_ADDR=${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}" # Wait for MSB initialization echo "Wait for MSB initialization" for i in {1..5}; do - curl -sS -m 1 ${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT} > /dev/null && break + curl -sS -m 1 $OPENPALETTE_MSB_IP:$OPENPALETTE_MSB_PORT > /dev/null && break sleep $i done -curl -X POST --data '{"serviceName": "activiti-rest","version": "v1","url": "/activiti-rest/","path": "/activiti-rest/","protocol": "REST","visualRange": "1","nodes": [{"ip": "${SERVICE_IP}","port": "${SERVICE_PORT}","ttl": 0}]}' http://${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}/api/microservices/v1/services -H "Accept: Application/json" -H "Content-Type:application/json" +curldata='{"serviceName": "activiti-rest", "version": "v1", "url": "/activiti-rest","protocol": "REST", "visualRange": "1", "path": "/activiti-rest", "nodes": [ {"ip": "'$SERVICE_IP'","port": "'$SERVICE_PORT'","ttl": 0}]}' + +curl -v -X POST -H "Accept: Application/json" -H "Content-Type: application/json" -d "${curldata}" http://$OPENPALETTE_MSB_IP:$OPENPALETTE_MSB_PORT/api/microservices/v1/services case "$CMD" in "dev" ) @@ -39,7 +41,7 @@ case "$CMD" in "start" ) # we can modify files here, using ENV variables passed in # "docker create" command. It can't be done during build process. - exec ./catalina.sh run + exec ./bin/catalina.sh run ;; * ) # Run custom command. Thanks to this line we can still use diff --git a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh index 2a610c0..8f9d084 100644 --- a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh +++ b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh @@ -31,7 +31,9 @@ for i in {1..5}; do sleep $i done -curl -X POST --data '{"serviceName": "workflow","version": "v1","url": "/api/workflow/v1/","protocol": "REST","visualRange": "1","nodes": [{"ip": "${SERVICE_IP}","port": "${SERVICE_PORT}","ttl": 0}]}' http://${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}/api/microservices/v1/services -H "Accept: Application/json" -H "Content-Type:application/json" +curldata='{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST", "visualRange": "1", "nodes": [ {"ip": "'$SERVICE_IP'","port": "'$SERVICE_PORT'","ttl": 0}]}' + +curl -v -X POST -H "Accept: Application/json" -H "Content-Type: application/json" -d "${curldata}" http://$OPENPALETTE_MSB_IP:$OPENPALETTE_MSB_PORT/api/microservices/v1/services case "$CMD" in "dev" ) diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh index f5af82c..52595da 100644 --- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh +++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh @@ -1,67 +1,67 @@ -#!/bin/bash - -DIRNAME=`dirname $0` -DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd` -echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" -cd ${DOCKER_BUILD_DIR} - -BUILD_ARGS="--no-cache" -ORG="onap" -# VERSION="1.0.0" -VERSION="1.0.0-SNAPSHOT" -PROJECT="vfc" -IMAGE="wfengine-mgrservice" -DOCKER_REPOSITORY="nexus3.onap.org:10003" -IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" - -POM_DIR="../../../" -cd ${POM_DIR} -# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo) -# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate) -echo "VERSION=${VERSION}" - -cd ${DOCKER_BUILD_DIR} -if [[ $VERSION != *-SNAPSHOT ]]; then - NEXUSREPONAME="releases" -else - NEXUSREPONAME="snapshots" -fi -echo "NEXUSREPONAME=${NEXUSREPONAME}" - -if [ $HTTP_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" - CURLPROXY="-x ${HTTP_PROXY}" -fi -if [ $http_proxy ]; then - BUILD_ARGS+=" --build-arg HTTP_PROXY=${http_proxy}" - CURLPROXY="-x ${http_proxy}" -fi -if [ $HTTPS_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" - CURLPROXY="-x ${HTTS_PROXY}" -fi -if [ $https_proxy ]; then - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${https_proxy}" - CURLPROXY="-x ${https_proxy}" -fi -echo "CURLPROXY=${CURLPROXY}" - -rm -f ./bin/workflow-engine-mgr-service*.jar -echo "${CURLPROXY}" -m 300 -O -J -L "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" LATEST -#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=workflow-engine-mgr-service&e=jar&v=${VERSION}" -wget -O workflow-engine-mgr-service.jar "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" -mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar - -function build_image { - echo "Start build docker image: ${IMAGE_NAME}" - docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest . -} - -function push_image { - echo "Start push docker image: ${IMAGE_NAME}" - docker push ${IMAGE_NAME}:${VERSION} - docker push ${IMAGE_NAME}:latest -} - -build_image -push_image +#!/bin/bash
+
+DIRNAME=`dirname $0`
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
+cd ${DOCKER_BUILD_DIR}
+
+BUILD_ARGS="--no-cache"
+ORG="onap"
+# VERSION="1.0.0"
+VERSION="1.0.0-SNAPSHOT"
+PROJECT="vfc"
+IMAGE="wfengine-mgrservice"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+
+POM_DIR="../../../"
+cd ${POM_DIR}
+VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)
+# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)
+echo "VERSION=${VERSION}"
+
+cd ${DOCKER_BUILD_DIR}
+if [[ $VERSION != *-SNAPSHOT ]]; then
+ NEXUSREPONAME="releases"
+else
+ NEXUSREPONAME="snapshots"
+fi
+echo "NEXUSREPONAME=${NEXUSREPONAME}"
+
+if [ $HTTP_PROXY ]; then
+ BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
+ CURLPROXY="-x ${HTTP_PROXY}"
+fi
+if [ $http_proxy ]; then
+ BUILD_ARGS+=" --build-arg HTTP_PROXY=${http_proxy}"
+ CURLPROXY="-x ${http_proxy}"
+fi
+if [ $HTTPS_PROXY ]; then
+ BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+ CURLPROXY="-x ${HTTS_PROXY}"
+fi
+if [ $https_proxy ]; then
+ BUILD_ARGS+=" --build-arg HTTPS_PROXY=${https_proxy}"
+ CURLPROXY="-x ${https_proxy}"
+fi
+echo "CURLPROXY=${CURLPROXY}"
+
+rm -f ./bin/workflow-engine-mgr-service*.jar
+echo "${CURLPROXY}" -m 300 -O -J -L "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" LATEST
+#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=workflow-engine-mgr-service&e=jar&v=${VERSION}"
+wget -O workflow-engine-mgr-service.jar "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}"
+mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar
+
+function build_image {
+ echo "Start build docker image: ${IMAGE_NAME}"
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image {
+ echo "Start push docker image: ${IMAGE_NAME}"
+ docker push ${IMAGE_NAME}:${VERSION}
+ docker push ${IMAGE_NAME}:latest
+}
+
+build_image
+push_image
|