Fix the docker build error for vfc-nfvo-wfengine

[vfc/nfvo/wfengine.git] / wfenginemgrservice / src / main / docker / wfenginemgrservice-docker-build_image.sh

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 (file)
--- 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\r
+\r
+DIRNAME=`dirname $0`\r
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`\r
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"\r
+cd ${DOCKER_BUILD_DIR}\r
+\r
+BUILD_ARGS="--no-cache"\r
+ORG="onap"\r
+# VERSION="1.0.0"\r
+VERSION="1.0.0-SNAPSHOT"\r
+PROJECT="vfc"\r
+IMAGE="wfengine-mgrservice"\r
+DOCKER_REPOSITORY="nexus3.onap.org:10003"\r
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"\r
+\r
+POM_DIR="../../../"\r
+cd ${POM_DIR}\r
+VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)\r
+# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)\r
+echo "VERSION=${VERSION}"\r
+\r
+cd ${DOCKER_BUILD_DIR}\r
+if [[ $VERSION != *-SNAPSHOT ]]; then\r
+  NEXUSREPONAME="releases"\r
+else\r
+  NEXUSREPONAME="snapshots"\r
+fi\r
+echo "NEXUSREPONAME=${NEXUSREPONAME}"\r
+\r
+if [ $HTTP_PROXY ]; then\r
+    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"\r
+    CURLPROXY="-x ${HTTP_PROXY}"\r
+fi\r
+if [ $http_proxy ]; then\r
+    BUILD_ARGS+=" --build-arg HTTP_PROXY=${http_proxy}"\r
+    CURLPROXY="-x ${http_proxy}"\r
+fi\r
+if [ $HTTPS_PROXY ]; then\r
+    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"\r
+    CURLPROXY="-x ${HTTS_PROXY}"\r
+fi\r
+if [ $https_proxy ]; then\r
+    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${https_proxy}"\r
+    CURLPROXY="-x ${https_proxy}"\r
+fi\r
+echo "CURLPROXY=${CURLPROXY}"\r
+\r
+rm -f ./bin/workflow-engine-mgr-service*.jar\r
+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\r
+#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}"\r
+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}"\r
+mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar \r
+\r
+function build_image {\r
+    echo "Start build docker image: ${IMAGE_NAME}"\r
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .\r
+}\r
+\r
+function push_image {\r
+    echo "Start push docker image: ${IMAGE_NAME}"\r
+    docker push ${IMAGE_NAME}:${VERSION}\r
+    docker push ${IMAGE_NAME}:latest\r
+}\r
+\r
+build_image\r
+push_image\r