update Dockerfile to onap

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

1 files changed, 22 insertions, 0 deletions

diff --git a/docker_merge.sh b/docker_merge.sh
index 2960f5c1..bbc0ca92 100755
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -56,13 +56,35 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
     echo $TAGS
 
     docker build --quiet $TAGS target/$image
+
+    if [ $? -ne 0 ]
+    then
+        echo "Docker build failed"
+        docker images
+        exit 1
+    fi
 done
 
+docker images
+
 #
 # Push images
 #
 for image in policy-nexus policy-db policy-drools policy-pe; do
     echo "Pushing $image"
     docker push ${DOCKER_REPOSITORY}/onap/policy/$image:${MVN_MAJMIN_VERSION}-latest
+
+    if [ $? -ne 0 ]
+    then
+        echo "Docker push failed"
+        exit 1
+    fi
+
     docker push ${DOCKER_REPOSITORY}/onap/policy/$image:${MVN_VERSION}-${TIMESTAMP}
+
+    if [ $? -ne 0 ]
+    then
+        echo "Docker push failed"
+        exit 1
+    fi
 done