diff options
author | 2017-12-21 09:02:38 +0800 | |
---|---|---|
committer | 2017-12-21 09:02:38 +0800 | |
commit | eacba3dc0b84bf5d79a251b5614fcddb6aaf70b2 (patch) | |
tree | 1fc3a8b4c74eb0b41444be4781317b499104abf6 | |
parent | 7a914faf04c3b8210636664f939d887bf1ce0b95 (diff) |
Unified vfc-vnflcm master version
Change-Id: Ib01b28537f72abdf53fe42255e0f4cae7c5ea324
Issue-ID: VFC-625
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rwxr-xr-x | lcm/docker/Dockerfile | 4 | ||||
-rwxr-xr-x | lcm/docker/build_image.sh | 2 | ||||
-rw-r--r-- | version.properties | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile index 5d264543..05ef5a51 100755 --- a/lcm/docker/Dockerfile +++ b/lcm/docker/Dockerfile @@ -30,12 +30,12 @@ ADD . /service WORKDIR /service # get binary zip from nexus -RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip' && \ +RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip' && \ unzip vfc-gvnfm-vnflcm-lcm.zip && \ rm -rf vfc-gvnfm-vnflcm-lcm.zip # get db scripts from nexus -RUN wget -q -O vfc-gvnfm-vnfres-res.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=LATEST&e=zip' && \ +RUN wget -q -O vfc-gvnfm-vnfres-res.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=LATEST&e=zip' && \ unzip vfc-gvnfm-vnfres-res.zip vfc/gvnfm/vnfres/res/assembly/*.* && \ mv ./vfc/gvnfm/vnfres/res/assembly/bin ./bin && \ mv ./vfc/gvnfm/vnfres/res/assembly/dbscripts ./dbscripts && \ diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh index 45419736..39d748e6 100755 --- a/lcm/docker/build_image.sh +++ b/lcm/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.0.1" +VERSION="1.1.0" PROJECT="vfc" IMAGE="vnflcm" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/version.properties b/version.properties index 3e4a5502..d7c69cd5 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=1 -patch=1 +patch=0 base_version=${major}.${minor}.${patch} |