summaryrefslogtreecommitdiffstats
path: root/docker_merge.sh
diff options
context:
space:
mode:
authormmis <michael.morris@ericsson.com>2018-03-14 12:10:52 +0000
committerMichael Morris <michael.morris@ericsson.com>2018-03-14 14:54:09 +0000
commitac6780a5fffc4910aba8af189cc87be9b28616da (patch)
tree706f222fc637dd0d292e3f782b80bc0662450dc4 /docker_merge.sh
parent22a233570c270369fbe20a712f97430a21652b20 (diff)
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>
Diffstat (limited to 'docker_merge.sh')
-rw-r--r--docker_merge.sh10
1 files changed, 5 insertions, 5 deletions
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