From ac6780a5fffc4910aba8af189cc87be9b28616da Mon Sep 17 00:00:00 2001
From: mmis <michael.morris@ericsson.com>
Date: Wed, 14 Mar 2018 12:10:52 +0000
Subject: Renamed policy-drools docker image

Renamed from:
onap/policy/policy-drools
to
onap/policy-drools
to enable consistent naming across nexus and docker hub

Issue-ID: POLICY-674
Change-Id: Ib0b9df97f398c5c1715f736f11f6481cf6d8427f
Signed-off-by: mmis <michael.morris@ericsson.com>
---
 docker_build.sh  | 14 +++++++-------
 docker_merge.sh  | 10 +++++-----
 docker_verify.sh |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docker_build.sh b/docker_build.sh
index 2c5be1d2..1168a2a8 100644
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -46,19 +46,19 @@ echo "Building $IMAGE"
 #
 # 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}"
 
 echo $TAGS
 
@@ -75,7 +75,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
@@ -84,7 +84,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
@@ -92,7 +92,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}
 
 if [ $? -ne 0 ]
 then
diff --git a/docker_merge.sh b/docker_merge.sh
index ffcb49ab..bd2b99bc 100644
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -46,15 +46,15 @@ echo "Building $IMAGE"
 #
 # 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}"
 
 echo $TAGS
 
@@ -73,7 +73,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
@@ -81,7 +81,7 @@ then
     exit 1
 fi
 
-docker push ${DOCKER_REPOSITORY}/onap/policy/$IMAGE:${MVN_VERSION}-${TIMESTAMP}
+docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}
 
 if [ $? -ne 0 ]
 then
diff --git a/docker_verify.sh b/docker_verify.sh
index 5e848711..99043f62 100644
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -49,15 +49,15 @@ echo "Building $IMAGE"
 #
 # 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}"
 
 echo $TAGS
 
-- 
cgit 1.2.3-korg