diff options
| author |   Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-12 12:55:39 +0800 |
|---|---|---|
| committer | Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-12 12:55:39 +0800 |
| commit | d1d3a58f7cd4ef97d9f2eb90da1de13227e5035e (patch) | |
| tree | 82bf264c599338b5aea87e654226aa9dcaa8d8b3 /activiti-extension/src/main/docker/activiti-docker-build_image.sh | |
| parent | 2f49c6932d9e2ce60531384a848546db7964833d (diff) | |
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>
Diffstat (limited to 'activiti-extension/src/main/docker/activiti-docker-build_image.sh')
| -rw-r--r-- | activiti-extension/src/main/docker/activiti-docker-build_image.sh | 7 |
1 files changed, 5 insertions, 2 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) |