conform new reqs

Change-Id: I255d1495d27ee2546f398a8b2ee00710a1835d1e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/docker_build.sh b/docker_build.sh
index fa98db2..acd07c9 100755 (executable)
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -2,7 +2,13 @@
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
 
+#
+# THIS SHOULD BE REPLACED WITH SPECIFIC REPOSITORY FOR THIS RELEASE
+#
 DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+#
+# RELEASE BUILD CREATES latest tag and the STAGING tag
+#
 MVN_VERSION=$(cat target/version)
 MVN_VERSION="${MVN_VERSION}-STAGING"
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
@@ -33,7 +39,6 @@ done
 
 for image in policy-nexus policy-db policy-drools policy-pe; do
     echo "Pushing $image"
-#    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:latest
-#    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-latest
+    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:latest
     docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-${TIMESTAMP}
 done

diff --git a/docker_merge.sh b/docker_merge.sh
index 8d5eef7..43e759a 100755 (executable)
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
-
+#
+# THIS SHOULD POINT TO THE SNAPSHOT repo
+#
 DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+#
+# Should be appended with -SNAPSHOT
+#
 MVN_VERSION=$(cat target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
 
@@ -20,15 +25,19 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
 
     TAGS="--tag openecomp/policy/${image}:latest"
     TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:latest"
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-latest"
     TAGS="${TAGS} --tag openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
     TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
 
     echo $TAGS
+
+    docker build --quiet $TAGS target/$image
+    docker images
 done
 
-#for image in policy-nexus policy-db policy-drools policy-pe; do
-#    echo "Pushing $image"
-##    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-latest
-#    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-${TIMESTAMP}
-#done
+#
+# NO latest tag. SNAPSHOTS are for internal testing
+#
+for image in policy-nexus policy-db policy-drools policy-pe; do
+    echo "Pushing $image"
+    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-${TIMESTAMP}
+done

diff --git a/docker_verify.sh b/docker_verify.sh
index a78a496..3142084 100755 (executable)
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
-
+#
+# JUST VERIFY ONLY - NO PUSHING
+#
 DOCKER_REPOSITORY=nexus3.openecomp.org:10003
 MVN_VERSION=$(cat target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
@@ -20,9 +22,13 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
 
     TAGS="--tag openecomp/policy/${image}:latest"
     TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:latest"
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-latest"
     TAGS="${TAGS} --tag openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
     TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
 
     echo $TAGS
+
+    docker build --quiet $TAGS target/$image
 done
+
+docker images
+