From af9d9080fdfe3a38ae0d03d6f897fcb992f63db1 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Mon, 16 Oct 2017 18:22:13 +0800 Subject: Add vfc docker build staging tag Change-Id: Iccba74545e625d04fb4395c4cdc72cb465a52d1c Issue-Id: VFC-535 Signed-off-by: fujinhua --- .../src/main/assembly/docker/build_image.sh | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/ems/microservice-standalone/src/main/assembly/docker/build_image.sh b/ems/microservice-standalone/src/main/assembly/docker/build_image.sh index fba8722..f83b964 100755 --- a/ems/microservice-standalone/src/main/assembly/docker/build_image.sh +++ b/ems/microservice-standalone/src/main/assembly/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="emsdriver" 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}" @@ -19,15 +20,26 @@ if [ $HTTPS_PROXY ]; then BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi -function build_emsdriver { - docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest . +function build_image { + echo "Start build docker image: ${IMAGE_NAME}" + docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest . } -function push_emsdriver { - docker push ${IMAGE_NAME}:${VERSION} - docker push ${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} } -build_emsdriver -push_emsdriver +function push_image { + 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 +push_image -- cgit 1.2.3-korg