X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker_build.sh;h=aa0ac4776289a00c060d143defa9b7d654c98603;hb=2817079ede91e3e38f767086cccb485ceff6dd03;hp=1548eade7ef5197af02f5d590d83860d2510aba3;hpb=44a296f53e8faf2b458c59355e5a2506ad46aca5;p=policy%2Fengine.git diff --git a/docker_build.sh b/docker_build.sh index 1548eade7..aa0ac4776 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -42,26 +42,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 +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 @@ -87,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 @@ -95,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}Z if [ $? -ne 0 ] then