summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2017-03-30 12:46:08 -0400
committerPamela Dragosh <pdragosh@research.att.com>2017-03-30 13:43:52 -0400
commit9bd4bf6ac4aa36b7c16ff002d5262e577f08c14f (patch)
tree7fc7de7f649c06e3af5bb38002d88e08d5a3cb18
parent18882a02287cc431144612ac87a5a3473693c067 (diff)
update Dockerfile to onap
Change-Id: I9c5229cdc79a7dfc5f74d919c58aa579084fef55 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rwxr-xr-xdocker_build.sh32
-rwxr-xr-xdocker_merge.sh22
-rwxr-xr-xdocker_verify.sh7
-rw-r--r--policy-base/Dockerfile2
-rw-r--r--policy-db/Dockerfile2
-rw-r--r--policy-drools/Dockerfile2
-rw-r--r--policy-nexus/Dockerfile2
-rw-r--r--policy-pe/Dockerfile2
8 files changed, 66 insertions, 5 deletions
diff --git a/docker_build.sh b/docker_build.sh
index cd86c629..cbce1082 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -56,11 +56,43 @@ 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
+
for image in policy-nexus policy-db policy-drools policy-pe; do
echo "Pushing $image"
+
docker push ${DOCKER_REPOSITORY}/onap/policy/$image:latest
+
+ if [ $? -ne 0 ]
+ then
+ echo "Docker push failed"
+ exit 1
+
+ fi
+
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}-STAGING-${TIMESTAMP}
+
+ if [ $? -ne 0 ]
+ then
+ echo "Docker push failed"
+ exit 1
+
+ fi
done
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
diff --git a/docker_verify.sh b/docker_verify.sh
index 3037e24f..cdb42e9d 100755
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -59,6 +59,13 @@ 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
diff --git a/policy-base/Dockerfile b/policy-base/Dockerfile
index 53ae4c18..e6c4b1f5 100644
--- a/policy-base/Dockerfile
+++ b/policy-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/policy/policy-os
+FROM onap/policy/policy-os
# install MariaDB client
diff --git a/policy-db/Dockerfile b/policy-db/Dockerfile
index 5bdfd70e..002313cd 100644
--- a/policy-db/Dockerfile
+++ b/policy-db/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/policy/policy-os
+FROM onap/policy/policy-os
RUN \
apt-get clean && \
diff --git a/policy-drools/Dockerfile b/policy-drools/Dockerfile
index 920920e7..5a5c0ad9 100644
--- a/policy-drools/Dockerfile
+++ b/policy-drools/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/policy/policy-base
+FROM onap/policy/policy-base
RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install
WORKDIR /tmp/policy-install
diff --git a/policy-nexus/Dockerfile b/policy-nexus/Dockerfile
index 6bfd01d7..ab3e345f 100644
--- a/policy-nexus/Dockerfile
+++ b/policy-nexus/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/policy/policy-os
+FROM onap/policy/policy-os
# note that in following command sequence, wget exit status is 1 even on success,
diff --git a/policy-pe/Dockerfile b/policy-pe/Dockerfile
index 2f881b98..fe568082 100644
--- a/policy-pe/Dockerfile
+++ b/policy-pe/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/policy/policy-base
+FROM onap/policy/policy-base
RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install