summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-10-16 18:12:48 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-10-16 18:12:48 +0800
commit94f9d6e8d9577df710109963923ebedd6de001bb (patch)
tree7e0436bde43cd704c4ec64e981442ba82118ab43
parent27e744fb139f95deadb6c77f35d71c5351739d11 (diff)
Add vfc docker build staging tag
Change-Id: Ib2dfbadcb3a2802f6c1da5d901283ad86c5bc34d Issue-Id: VFC-535 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh19
1 files changed, 15 insertions, 4 deletions
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
index d8d4402..addfcb9 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
+++ b/juju/juju-vnfmadapter/Juju-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="jujudriver"
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