diff options
Diffstat (limited to 'lcm/docker')
| -rwxr-xr-x | lcm/docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | lcm/docker/build_image.sh | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile index 5d264543..1a03d591 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=1.0.2&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=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/lcm/docker/build_image.sh b/lcm/docker/build_image.sh index 45419736..174ddd91 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.0.2" PROJECT="vfc" IMAGE="vnflcm" DOCKER_REPOSITORY="nexus3.onap.org:10003" @@ -21,21 +21,21 @@ 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 push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP} |