X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=docker_merge.sh;h=085a1ce0d20fbdadfe0fa04fd1db8cf09c1d45a7;hp=c8bde37e3bdbe4a0ed17b639fd7555fc87b10172;hb=4ea6678829127d8333e53f6944c54ec475fdcb5b;hpb=fa1e3fb147d1bb0f2446eaf9923acfcf18f8384d diff --git a/docker_merge.sh b/docker_merge.sh index c8bde37e3..085a1ce0d 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