summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-02-22 19:31:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-22 19:31:24 +0000
commit73ee35ddcae316bb14a219935a1225d4a59f08c8 (patch)
tree9a3092c73a5e69967cc371041800d4fc573b39f8 /jjb
parent982a7eb030bfe91ba4cb8fa5c976b5f4cad7f621 (diff)
parentdd28fcdb7a9828ecab50e824ff464ae7e7bfe602 (diff)
Merge "dovetail: docker build not set branch parameter"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng/opnfv-docker.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 7b93d50bf..ded743d7e 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -77,8 +77,12 @@ fi
echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
echo "--------------------------------------------------------"
echo
-cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BRANCH
- -f $DOCKERFILE ."
+if [[ $DOCKER_REPO_NAME == *"dovetail"* ]]; then
+ cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG -f $DOCKERFILE ."
+else
+ cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BRANCH
+ -f $DOCKERFILE ."
+fi
echo ${cmd}
${cmd}