Merge "dovetail: docker build not set branch parameter"

diff --combined jjb/releng/opnfv-docker.sh
index 7b93d50,edb10d1..ded743d
--- 1/jjb/releng/opnfv-docker.sh
--- 2/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@@ -43,11 -43,11 +43,11 @@@ f
  if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then
      echo "Docker images to remove:"
      docker images | head -1 && docker images | grep $DOCKER_REPO_NAME
 -    image_tags=($(docker images | grep $DOCKER_REPO_NAME | awk '{print $2}'))
 -    for tag in "${image_tags[@]}"; do
 -        if [[ -n "$(docker images|grep $DOCKER_REPO_NAME|grep $tag)" ]]; then
 -            echo "Removing docker image $DOCKER_REPO_NAME:$tag..."
 -            docker rmi -f $DOCKER_REPO_NAME:$tag
 +    image_ids=($(docker images | grep $DOCKER_REPO_NAME | awk '{print $3}'))
 +    for id in "${image_ids[@]}"; do
 +        if [[ -n "$(docker images|grep $DOCKER_REPO_NAME|grep $id)" ]]; then
 +            echo "Removing docker image $DOCKER_REPO_NAME:$id..."
 +            docker rmi -f $id
          fi
      done
  fi
@@@ -77,8 -77,12 +77,12 @@@ f
  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}