summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-10-16 18:15:28 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-10-16 18:15:28 +0800
commit1341563df6fe9b9fbaf4001e53bb109f6a3d9ffe (patch)
tree5827577ea7ffced95e36385278173619c26ec196
parent926bbb113ad6b993d0bc252d777e48af23f500da (diff)
Add vfc docker build staging tag
Change-Id: I4a44ab756c7f38a13c682664aed2197ab4eca6de Issue-Id: VFC-535 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rwxr-xr-xhuawei/vnfmadapter/VnfmadapterService/docker/build_image.sh19
1 files changed, 15 insertions, 4 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
index b83cf6cd..923d818e 100755
--- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
@@ -6,11 +6,12 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.0.0"
PROJECT="vfc"
IMAGE="nfvo/svnfm/huawei"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -21,13 +22,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