X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker_merge.sh;h=316b9f2be9c8ff58067b77725b54c640442b071b;hb=d73f9545331d390ab3975840dea8c4a48beef498;hp=c87dacea604be2231822a00ce089d0c31d5b3c0c;hpb=87102d3e68569b81709633935dbd31070ce24a8b;p=policy%2Fengine.git

diff --git a/docker_merge.sh b/docker_merge.sh
index c87dacea6..316b9f2be 100644
--- a/docker_merge.sh
+++ b/docker_merge.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,22 +62,19 @@ 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 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}-${TIMESTAMP}"
+TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z"
 
 echo $TAGS
 
@@ -76,7 +93,7 @@ docker images
 # Push image
 #
 echo "Pushing $IMAGE"
-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
@@ -84,7 +101,7 @@ then
     exit 1
 fi
 
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:${MVN_VERSION}-${TIMESTAMP}
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}Z
 
 if [ $? -ne 0 ]
 then