diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-12-19 17:32:37 +0800 |
|---|---|---|
| committer | yunlong ying <ying.yunlong@zte.com.cn> | 2017-12-19 11:17:34 +0000 |
| commit | 9fe484a1391a1ede088a4a21fe1c7c534586e723 (patch) | |
| tree | 2b501c81f04172b71f5b6a0ab232e1d018bed2d0 | |
| parent | f9a3266f2fb5cfeec3346caa1ad1d2ee112a8e98 (diff) | |
Unified vfc-mgr amsterdam version
Change-Id: I03fdd01ec6a8c371c7ed52e4782f6c8c709b8f72
Issue-ID: VFC-625
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
| -rw-r--r-- | mgr/docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | mgr/docker/build_image.sh | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mgr/docker/Dockerfile b/mgr/docker/Dockerfile index b20a7d2..2214465 100644 --- a/mgr/docker/Dockerfile +++ b/mgr/docker/Dockerfile @@ -30,12 +30,12 @@ ADD . /service WORKDIR /service # get binary zip from nexus - vfc-gvnfm-vnfmgr -RUN wget -q -O vfc-gvnfm-vnfmgr.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfmgr.mgr&a=vfc-gvnfm-vnfmgr-mgr&v=LATEST&e=zip' && \ +RUN wget -q -O vfc-gvnfm-vnfmgr.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfmgr.mgr&a=vfc-gvnfm-vnfmgr-mgr&v=1.0.2&e=zip' && \ unzip vfc-gvnfm-vnfmgr.zip && \ rm -rf vfc-gvnfm-vnfmgr.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=snapshots&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=1.0.2&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/mgr/docker/build_image.sh b/mgr/docker/build_image.sh index 47bc0fb..6b81fda 100755 --- a/mgr/docker/build_image.sh +++ b/mgr/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.0.1" +VERSION="1.0.2" PROJECT="vfc" IMAGE="vnfmgr" 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 |