From bf4f8aeddd1b4c78e5473718510b635112ec6fca Mon Sep 17 00:00:00 2001 From: luxin Date: Fri, 22 Dec 2017 15:43:33 +0800 Subject: [PATCH] Update tag in build_image.sh Change-Id: I2468cb77c5d39966d6a31c6be933e717643fd006 Issue-ID: VFC-624 Signed-off-by: luxin --- huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh | 10 +++++----- nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh index 90b4b4cb..2b113e35 100755 --- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh +++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh @@ -21,20 +21,20 @@ if [ $HTTPS_PROXY ]; then fi function build_image { - echo "Start build docker image: ${IMAGE_NAME}" - docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest . + echo "Start build docker image: ${IMAGE_NAME}:${VERSION}-latest" + docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION}-latest . } function push_image_tag { TAG_NAME=$1 echo "Start push ${TAG_NAME}" - docker tag ${IMAGE_NAME}:latest ${TAG_NAME} + docker tag ${IMAGE_NAME}:${VERSION}-latest ${TAG_NAME} docker push ${TAG_NAME} } function push_image { - echo "Start push ${IMAGE_NAME}:latest" - docker push ${IMAGE_NAME}:latest + echo "Start push ${IMAGE_NAME}:${VERSION}-latest" + docker push ${IMAGE_NAME}:${VERSION}-latest push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh index bed2a3bd..65e2ac9d 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh @@ -37,20 +37,20 @@ if [ $HTTPS_PROXY ]; then fi function build_image { - echo "Start build docker image: ${IMAGE_NAME}" - docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest . + echo "Start build docker image: ${IMAGE_NAME}:${VERSION}-latest" + docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION}-latest . } function push_image_tag { TAG_NAME=$1 echo "Start push ${TAG_NAME}" - docker tag ${IMAGE_NAME}:latest ${TAG_NAME} + docker tag ${IMAGE_NAME}:${VERSION}-latest ${TAG_NAME} docker push ${TAG_NAME} } function push_image { - echo "Start push ${IMAGE_NAME}:latest" - docker push ${IMAGE_NAME}:latest + echo "Start push ${IMAGE_NAME}:${VERSION}-latest" + docker push ${IMAGE_NAME}:${VERSION}-latest push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest -- 2.16.6