X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=docker_build.sh;h=671b54ffefa4a055833896b4cf259f1f4e175f4d;hp=55ee96457a4a77401359fa5af5b5ee7d3615a22a;hb=54eaa820dd76f8da6076b6aad3d2c75c68236693;hpb=e53bd66cc71fcc3f7dff762054790c382d7dd499 diff --git a/docker_build.sh b/docker_build.sh index 55ee96457..671b54ffe 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -1,18 +1,38 @@ #!/bin/bash +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' 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=${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 @@ -58,11 +78,11 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat # # This has the nexus repo prepended and major/minor/patch version with timestamp # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z" 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 @@ -92,7 +112,7 @@ then exit 1 fi -docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP} +docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z if [ $? -ne 0 ] then