aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-12-19 15:39:48 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-12-19 15:39:48 +0800
commit99b165a8bb3872d63c27aa5f681ac18af6654777 (patch)
treefba013cf5db581378d0bcd1b3396fedc50620ab9
parentcbcbff7350290b0fcc9128e64f7c75c82fc0589c (diff)
Update VFC version numberamsterdam
Change-Id: I8958191d3aa92bc35259ad80eb4360f5fccfb7c7 Issue-ID: VFC-624 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rwxr-xr-xdocker/Dockerfile2
-rwxr-xr-xdocker/build_image.sh12
2 files changed, 7 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 28b259c9..ae9cc2a6 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ ADD . /service
WORKDIR /service
# get binary zip from nexus - vfc-nfvo-lcm
-RUN wget -q -O vfc-nfvo-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.lcm&a=vfc-nfvo-lcm&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-nfvo-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.lcm&a=vfc-nfvo-lcm&v=1.0.3&e=zip' && \
unzip vfc-nfvo-lcm.zip && \
rm -rf vfc-nfvo-lcm.zip
diff --git a/docker/build_image.sh b/docker/build_image.sh
index d1ea78f2..40cdbaca 100755
--- a/docker/build_image.sh
+++ b/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="nslcm"
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