summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluxin <luxin7@huawei.com>2017-12-21 10:22:12 +0800
committerluxin <luxin7@huawei.com>2017-12-21 10:22:12 +0800
commit8a12c6c1abbcff4dd5fdccc80586bacfbd3ab82e (patch)
tree75b96d22a1a81b2afe6f8d8e2d7f0e63fc02420c
parentae76bfcba4121a74f79debbd40d70895c89fb79a (diff)
Update VFC version number
Change-Id: I9f36b2a830a53fe2aebad60b8617de7cbe1f9d93 Issue-ID: VFC-624 Signed-off-by: luxin <luxin7@huawei.com>
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile6
-rwxr-xr-xhuawei/vnfmadapter/VnfmadapterService/docker/build_image.sh2
2 files changed, 3 insertions, 5 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
index 35d31c05..6c0db2fd 100644
--- a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
@@ -36,14 +36,12 @@ ENV CATALINA_HOME /service
# 50-microservice.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY
# Set up microservice
-# https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter&a=hw-vnfmadapter-deployment&v=LATEST&e=zip
-RUN wget -q -O nfvo-driver-vnfm-huawei-1.0.0-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter&a=hw-vnfmadapter-deployment&v=LATEST&e=zip" && unzip -q -o -B nfvo-driver-vnfm-huawei-1.0.0-SNAPSHOT.zip && rm -f nfvo-driver-vnfm-huawei-1.0.0-SNAPSHOT.zip
+
+RUN wget -q -O nfvo-driver-vnfm-huawei.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter&a=hw-vnfmadapter-deployment&v=LATEST&e=zip" && unzip -q -o -B nfvo-driver-vnfm-huawei.zip && rm -f nfvo-driver-vnfm-huawei.zip
# Set permissions
RUN find . -type d -exec chmod o-w {} \;
RUN find . -name "*.sh" -exec chmod +x {} \;
EXPOSE 8482
-RUN echo ONAP nfvo-driver-vnfm-huawei 1.0.0-SNAPSHOT "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter&a=hw-vnfmadapter-deployment&v=LATEST&e=zip" > ONAP_VERSION
-
# 90-entrypoint.txt
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
index 53d0ab31..2f624f4d 100755
--- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.2"
+VERSION="1.1.0"
PROJECT="vfc"
IMAGE="nfvo/svnfm/huawei"
DOCKER_REPOSITORY="nexus3.onap.org:10003"