summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-12-19 19:43:30 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-12-19 19:43:30 +0800
commit21b1aed722ceb0bdb5cf33bd3826866348afb760 (patch)
tree73f0b1356425ca60248347f28fafe857d3e078fe
parenta1fa43b513dcf453e40c7befc64b023e935abcf3 (diff)
Update VFC version number
Change-Id: I75dd3c19999eb3c890c68ca27091d4200880e37d Issue-ID: VFC-624 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r--zte/vmanager/docker/Dockerfile2
-rwxr-xr-xzte/vmanager/docker/build_image.sh12
2 files changed, 7 insertions, 7 deletions
diff --git a/zte/vmanager/docker/Dockerfile b/zte/vmanager/docker/Dockerfile
index db1c6c9f..dc0553cb 100644
--- a/zte/vmanager/docker/Dockerfile
+++ b/zte/vmanager/docker/Dockerfile
@@ -23,7 +23,7 @@ ADD . /service
WORKDIR /service
# get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
-RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=1.0.3&e=zip' && \
unzip vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip && \
rm -rf vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip
diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh
index ba628a89..88897dd5 100755
--- a/zte/vmanager/docker/build_image.sh
+++ b/zte/vmanager/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.2"
+VERSION="1.0.3"
PROJECT="vfc"
IMAGE="ztevmanagerdriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -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