X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=docker_verify.sh;h=d97a87f1a335b7cefe64284399aabb76f67cda87;hp=428efece839d17b64a4f3cc72d4cc3569964eab4;hb=6bc4e95261ed8ec8bc931696e3674ee5ec54d542;hpb=daee922e51e60c3cad6a3cc691214a34aad9ac7f diff --git a/docker_verify.sh b/docker_verify.sh index 428efece8..d97a87f1a 100644 --- a/docker_verify.sh +++ b/docker_verify.sh @@ -28,14 +28,14 @@ DOCKER_REPOSITORY=nexus3.onap.org:10003 MVN_VERSION=$(cat packages/docker/target/version) MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version) TIMESTAMP=$(date -u +%Y%m%dT%H%M%S) -PROXY_ARGS="" +BUILD_ARGS="--build-arg BUILD_VERSION_ENGINE=${MVN_VERSION}" IMAGE=policy-pe 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 echo $DOCKER_REPOSITORY @@ -66,6 +66,10 @@ echo $MVN_MAJMIN_VERSION echo "Building $IMAGE" +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 +docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 + # # This is the local latest tagged image. The Dockerfile's need this to build images # @@ -81,7 +85,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAM echo $TAGS -docker build --quiet ${PROXY_ARGS} $TAGS packages/docker/target/$IMAGE +docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE if [ $? -ne 0 ] then