X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=shell%2Fdocker-build.sh;h=1cb71d3fff76ef1867592f0ae421b68cb5bc685b;hb=58d391aef8a98935efcb0ad5d70545e7728ad6d3;hp=3d633d088aa88bb973152dce0196866c4a6d28ec;hpb=f801ba055536d4b9c3c1a674661a74ced5a169bf;p=ci-management.git

diff --git a/shell/docker-build.sh b/shell/docker-build.sh
index 3d633d088..1cb71d3ff 100644
--- a/shell/docker-build.sh
+++ b/shell/docker-build.sh
@@ -4,14 +4,18 @@
 set -e -o pipefail
 
 FULL_DATE=`date +'%Y%m%dT%H%M%S'`
-IMAGE_VERSION= $( xmlstarlet sel -N "x=http://maven.apache.org/POM/4.0.0" -t -v "/x:project/x:version" pom.xml | cut -c1-5 )
+IMAGE_VERSION=`xmlstarlet sel -N "x=http://maven.apache.org/POM/4.0.0" -t -v "/x:project/x:version" pom.xml | cut -c1-5`
 
-case $DOCKERREGISTRY in
-   '$DOCKER_REGISTRY:10004') DOCKER_TAG="$IMAGE_VERSION"-STAGING-"$FULL_DATE"Z
-      echo "Using tag $DOCKER_TAG"
+case "$BUILD_MODE" in
+   "STAGING")
+      DOCKER_TAG="$IMAGE_VERSION"-STAGING-"$FULL_DATE"Z
+      DOCKER_LATEST_TAG="$IMAGE_VERSION"-STAGING-latest
+      echo "Using tags $DOCKER_TAG and $DOCKER_LATEST_TAG"
       ;;
-   '$DOCKER_REGISTRY:10003') DOCKER_TAG="$IMAGE_VERSION"-SNAPSHOT-"$FULL_DATE"Z
-      echo "Using tag $DOCKER_TAG"
+   "SNAPSHOT")
+      DOCKER_TAG="$IMAGE_VERSION"-SNAPSHOT-"$FULL_DATE"Z
+      DOCKER_LATEST_TAG="$IMAGE_VERSION"-SNAPSHOT-latest
+      echo "Using tags $DOCKER_TAG and $DOCKER_LATEST_TAG"
       ;;
 esac
 
@@ -21,14 +25,17 @@ cd "$DOCKER_ROOT"
 # DOCKERREGISTRY is purposely not using an '_' so as to not conflict with the
 # Jenkins global env var of the DOCKER_REGISTRY which the docker-login step uses
 IMAGE_NAME="$DOCKERREGISTRY/$DOCKER_NAME:$DOCKER_TAG"
+IMAGE_NAME_LATEST="$DOCKERREGISTRY/$DOCKER_NAME:$DOCKER_LATEST_TAG"
 
 # Build the docker image
 
 # Allow word splitting
 # shellcheck disable=SC2086
-docker build $DOCKER_ARGS . -t $IMAGE_NAME | tee "$WORKSPACE/docker_build_log.txt"
+docker build $DOCKER_ARGS . -t $IMAGE_NAME -t $IMAGE_NAME_LATEST | tee "$WORKSPACE/docker_build_log.txt"
 
 # Write DOCKER_IMAGE information to a file so it can be injected into the
 # environment for following steps
 echo "DOCKER_IMAGE=$IMAGE_NAME" >> "$WORKSPACE/env_inject.txt"
+echo "DOCKER_IMAGE_LATEST=$IMAGE_NAME_LATEST" >> "$WORKSPACE/env_inject.txt"
+