From d1d3a58f7cd4ef97d9f2eb90da1de13227e5035e Mon Sep 17 00:00:00 2001
From: Zhaoxing <meng.zhaoxing1@zte.com.cn>
Date: Thu, 12 Oct 2017 12:55:39 +0800
Subject: [PATCH] Fix the docker build error for vfc-nfvo-wfengine

Change-Id: Ida7fa3dbcb0419967dd5f6862a1e30cc60d6d47e
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
---
 .../src/main/docker/activiti-docker-build_image.sh               | 7 +++++--
 .../src/main/docker/wfenginemgrservice-docker-build_image.sh     | 9 ++++++---
 2 files changed, 11 insertions(+), 5 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 b6aefec..0e8d9d6 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env /bin/bash
+#!/bin/bash
 
 DIRNAME=`dirname $0`
 DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
@@ -18,14 +18,16 @@ POM_DIR="../../../"
 cd ${POM_DIR}
 
 mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')
-echo mvncmd=$mvncmd
 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"
@@ -33,6 +35,7 @@ else
   echo "Maven is not installed, mvncmd=$mvncmd"
   exit 1
 fi
+echo "mvncmd=${mvncmd}"
 
 pwd
 #VERSION=$(printf 'VER\t${project.version}\n0'|$mvncmd help:evaluate)
diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index 224e62d..5fb0b37 100644
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env /bin/bash
+#!/bin/bash
 
 DIRNAME=`dirname $0`
 DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
@@ -16,16 +16,18 @@ IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 
 POM_DIR="../../../"
 cd ${POM_DIR}
-
+env
 mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')
-echo mvncmd=$mvncmd
 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"
@@ -33,6 +35,7 @@ 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)
-- 
2.16.6