Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
OOF Policy Config File Creation Issue
[policy/engine.git]
/
docker_merge.sh
diff --git
a/docker_merge.sh
b/docker_merge.sh
index
c87dace
..
9312b48
100644
(file)
--- a/
docker_merge.sh
+++ b/
docker_merge.sh
@@
-42,22
+42,19
@@
fi
echo $MVN_MAJMIN_VERSION
echo "Building $IMAGE"
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
#
#
# 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
#
#
# 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
#
#
# 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
echo $TAGS
@@
-76,7
+73,7
@@
docker images
# Push image
#
echo "Pushing $IMAGE"
# 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
if [ $? -ne 0 ]
then
@@
-84,7
+81,7
@@
then
exit 1
fi
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
if [ $? -ne 0 ]
then