From cc971762cdf5e13df53f36de3b378b2351202253 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Mon, 4 Sep 2017 10:04:39 +0800 Subject: [PATCH] Fix image name of vfc-gvnfm-vnflcm Change-Id: I5f1954a82b436c9996590114c1df14efed65f166 Issue-Id: VFC-247 Signed-off-by: fujinhua --- lcm/docker/build_image.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh index cd083932..947803dc 100755 --- a/lcm/docker/build_image.sh +++ b/lcm/docker/build_image.sh @@ -1,29 +1,29 @@ #!/bin/bash -MYSQL_ROOT_PASSWORD="root" -PROXY_ARGS="" +BUILD_ARGS="--no-cache" ORG="onap" VERSION="1.0.0-SNAPSHOT" PROJECT="vfc" IMAGE="vnflcm" DOCKER_REPOSITORY="nexus3.onap.org:10003" +IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" if [ $HTTP_PROXY ]; then - PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}" + BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" fi if [ $HTTPS_PROXY ]; then - PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" + BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi function build_vnflcm { - docker build ${PROXY_ARGS} -t ${ORG}/${PROJECT}/${IMAGE}:${VERSION} -t ${ORG}/${PROJECT}/${IMAGE}:latest . + docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest . } function push_vnflcm { - docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}:${VERSION} - docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}:latest + docker push ${IMAGE_NAME}:${VERSION} + docker push ${IMAGE_NAME}:latest } build_vnflcm push_vnflcm -docker image list + -- 2.16.6