Fix the docker build error for vfc-nfvo-wfengine

Change-Id: If280f754302405a4367968cfa79b5791752fb963
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>

2 files changed, 89 insertions, 89 deletions

diff --git a/wfenginemgrservice/src/main/docker/bin/conf/workflow.yml b/wfenginemgrservice/src/main/docker/bin/conf/workflow.yml
index ce257b6..af4dcb8 100644
--- a/wfenginemgrservice/src/main/docker/bin/conf/workflow.yml
+++ b/wfenginemgrservice/src/main/docker/bin/conf/workflow.yml
@@ -13,7 +13,7 @@ server:
   adminContextPath: /admin
   connector:
     type: http
-    port: 8804
+    port: 10550
 
 # Logging settings.
 logging:
diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index 5fb0b37..33b1130 100644
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -1,88 +1,88 @@
-#!/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}

-env

-mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')

-if [[ 1$mvncmd != 1 ]]; then

-  echo $mvncmd

-elif [ $MVN ]; then

-  echo MVN

-  mvncmd=$MVN

-elif [ $M2_HOME ]; then

-  echo M2_HOME

-  mvncmd=$M2_HOME/bin/mvn

-elif [ -f "/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" ]; then

-  echo /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn

-  mvncmd="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn"

-elif [ -f "/usr/share/maven/bin/mvn" ]; then

-  mvncmd="/usr/share/maven/bin/mvn"

-else

-  echo "Maven is not installed, mvncmd=$mvncmd"

-  exit 1

-fi

-echo "mvncmd=${mvncmd}"

-

-pwd

-VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)

-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}
+env
+mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')
+if [[ 1$mvncmd != 1 ]]; then
+  echo $mvncmd
+elif [ $MVN ]; then
+  echo MVN
+  mvncmd=$MVN
+elif [ $M2_HOME ]; then
+  echo M2_HOME
+  mvncmd=$M2_HOME/bin/mvn
+elif [ -f "/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" ]; then
+  echo /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn
+  mvncmd="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn"
+elif [ -f "/usr/share/maven/bin/mvn" ]; then
+  mvncmd="/usr/share/maven/bin/mvn"
+else
+  echo "Maven is not installed, mvncmd=$mvncmd"
+  exit 1
+fi
+echo "mvncmd=${mvncmd}"
+
+pwd
+VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)
+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