X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker_build.sh;h=17608df7669ff315f805ce625f621fbc5d1a46f4;hb=06890d6ab0b7b11eb3fa5a76234195a376b3854c;hp=1548eade7ef5197af02f5d590d83860d2510aba3;hpb=87102d3e68569b81709633935dbd31070ce24a8b;p=policy%2Fengine.git diff --git a/docker_build.sh b/docker_build.sh index 1548eade7..17608df76 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -1,4 +1,24 @@ #!/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 @@ -42,26 +62,23 @@ fi echo $MVN_MAJMIN_VERSION echo "Building $IMAGE" -mkdir -p packages/docker/target/$IMAGE -cp packages/docker/src/main/docker/* packages/docker/target/$IMAGE -cp packages/install/target/install-$MVN_VERSION.zip packages/docker/target/$IMAGE/install.zip # # This is the local latest tagged image. The Dockerfile's need this to build images # -TAGS="--tag onap/policy/${IMAGE}:latest" +TAGS="--tag onap/${IMAGE}:latest" # # This is the nexus repo prepended for latest tagged image. # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:latest" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:latest" # # This has the nexus repo prepended and only major/minor version with latest # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_MAJMIN_VERSION}-latest" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest" # # This has the nexus repo prepended and major/minor/patch version with timestamp # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z" echo $TAGS @@ -78,7 +95,7 @@ docker images echo "Pushing $IMAGE" -docker push ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:latest +docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:latest if [ $? -ne 0 ] then @@ -87,7 +104,7 @@ then fi -docker push ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_MAJMIN_VERSION}-latest +docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest if [ $? -ne 0 ] then @@ -95,7 +112,7 @@ then exit 1 fi -docker push ${DOCKER_REPOSITORY}/onap/policy/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP} +docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z if [ $? -ne 0 ] then