Merge "Add call to run shellcheck"

[releng.git] / jjb / releng / opnfv-docker.sh

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 6f8d81a..c906e1f 100644 (file)
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -12,6 +12,7 @@ set -o nounset
 set -o pipefail
 
 
+
 echo "Starting opnfv-docker for $DOCKER_REPO_NAME ..."
 echo "--------------------------------------------------------"
 echo
@@ -51,26 +52,23 @@ if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then
     done
 fi
 
-
-# cd to directory where Dockerfile is located
 cd $WORKSPACE/docker
-if [ ! -f ./Dockerfile ]; then
+if [ ! -f ${DOCKERFILE} ]; then
     echo "ERROR: Dockerfile not found."
     exit 1
 fi
 
 # Get tag version
-branch="${GIT_BRANCH##origin/}"
-echo "Current branch: $branch"
+echo "Current branch: $BRANCH"
 
-if [[ "$branch" == "master" ]]; then
+if [[ "$BRANCH" == "master" ]]; then
     DOCKER_TAG="latest"
 else
     if [[ "$RELEASE_VERSION" != "" ]]; then
-        release=$(echo $branch|sed 's/.*\///')
+        release=${BRANCH##*/}
         DOCKER_TAG=${release}.${RELEASE_VERSION}
         # e.g. colorado.1.0, colorado.2.0, colorado.3.0
-    else:
+    else
         DOCKER_TAG="stable"
     fi
 fi
@@ -79,7 +77,8 @@ 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 ."
+cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BRANCH
+    -f $DOCKERFILE ."
 
 echo ${cmd}
 ${cmd}