aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-12-19 17:04:09 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-12-19 17:04:09 +0800
commit11fd2ff28685415ccb1c86bffae1e94feb4394ea (patch)
tree4edc0604b0cf827f98478b9b70fe532de5acfcc4
parentaa4c5348f3be8232c2cbc113ccd6aeeee8cab4fc (diff)
Update VFC version numberamsterdam
Change-Id: I53eeb4f90fd3cc1c7104cbf272f9366e1d583eba 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 aa1a6e3c..8f1c8c17 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ ADD . /service
WORKDIR /service
# get binary zip from nexus - vfc-nfvo-catalog
-RUN wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=1.0.3&e=zip' && \
unzip vfc-nfvo-catalog.zip && \
rm -rf vfc-nfvo-catalog.zip
diff --git a/docker/build_image.sh b/docker/build_image.sh
index bb87cee9..1ac97cde 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="catalog"
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