From 1c6b9175aa561ab62c135fbaf65f306ca817deae Mon Sep 17 00:00:00 2001 From: fujinhua Date: Tue, 19 Dec 2017 17:29:00 +0800 Subject: Update VFC version number Change-Id: I4781747c2316109a223ea614e1da93289bb41545 Issue-ID: VFC-624 Signed-off-by: fujinhua --- .../plugin-standalone/src/main/assembly/docker/Dockerfile | 2 +- .../src/main/assembly/docker/build_image.sh | 12 ++++++------ zte/sfc-driver/sfc-driver/dependency-reduced-pom.xml | 4 ++-- zte/sfc-driver/version.properties | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile index e0c26f6..69a2ca8 100644 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile @@ -12,7 +12,7 @@ ADD . /service WORKDIR /service # get binary zip from nexus -RUN wget -q -O vfc-sfcdriver-zte.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone&a=vfc-nfvo-driver-sfc-zte-sfc-driver&v=LATEST&e=zip' && \ +RUN wget -q -O vfc-sfcdriver-zte.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone&a=vfc-nfvo-driver-sfc-zte-sfc-driver&v=1.0.1&e=zip' && \ unzip vfc-sfcdriver-zte.zip && \ rm -rf vfc-sfcdriver-zte.zip diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh index 97b9efe..426d02e 100755 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.0.0" +VERSION="1.0.1" PROJECT="vfc" IMAGE="ztesdncdriver" 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 diff --git a/zte/sfc-driver/sfc-driver/dependency-reduced-pom.xml b/zte/sfc-driver/sfc-driver/dependency-reduced-pom.xml index c8c7bc8..fa8d649 100644 --- a/zte/sfc-driver/sfc-driver/dependency-reduced-pom.xml +++ b/zte/sfc-driver/sfc-driver/dependency-reduced-pom.xml @@ -22,13 +22,13 @@ sfc-driver-parent org.onap.vfc.nfvo.driver.sfc - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT 4.0.0 org.onap.nfvo.sfc.components.sfc-driver sfc-driver sdno/20.components/sfc-driver - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT diff --git a/zte/sfc-driver/version.properties b/zte/sfc-driver/version.properties index 5128787..266427f 100644 --- a/zte/sfc-driver/version.properties +++ b/zte/sfc-driver/version.properties @@ -4,7 +4,7 @@ major=1 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg