X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fdocker%2Fbuild_image.sh;h=6e4e642be6445b90daae09a3a11abd366cb8eb73;hb=cd12f7c1f7290858027822502c37296bdcef14e9;hp=b83cf6cdedf12ae5bf350048a278144cb43f6a05;hpb=37ff0358f2542bd0d4a52d604be42a0ebc4d5c3b;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
index b83cf6cd..6e4e642b 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+#
+# Copyright 2017, Nokia Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 DIRNAME=`dirname $0`
 DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
 echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
@@ -6,11 +22,14 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.3.0"
 PROJECT="vfc"
-IMAGE="nfvo/svnfm/huawei"
+IMAGE="nfvo/svnfm/nokia"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
+
+BUILD_ARGS+=" --build-arg PKG_VERSION=${VERSION}"
 
 if [ $HTTP_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -21,13 +40,23 @@ fi
 
 function build_image {
     echo "Start build docker image: ${IMAGE_NAME}"
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image_tag {
+    TAG_NAME=$1
+    echo "Start push ${TAG_NAME}"
+    docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+    docker push ${TAG_NAME}
 }
 
 function push_image {
-    echo "Start push docker image: ${IMAGE_NAME}"
-    docker push ${IMAGE_NAME}:${VERSION}
+    echo "Start push ${IMAGE_NAME}:latest"
     docker push ${IMAGE_NAME}:latest
+    
+    push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}
 }
 
 build_image