From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 23 Aug 2017 18:27:19 -0400
Subject: Deliver centralized role management feature

Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.

Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
    PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 deliveries/os_docker_push.sh | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

(limited to 'deliveries/os_docker_push.sh')

diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index 2ec6de42..eb663b83 100755
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -1,40 +1,11 @@
 #!/bin/bash
+# Builds and pushes SNAPSHOT versions of Portal images
 
-# Establish environment variables
-source $(dirname $0)/os_settings.sh
-
-./run.sh
-
-REPO="nexus3.onap.org:10003"
+# be verbose
+set -x
 
 TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}"
-LATEST="latest"
-
-APPS_VERSION="${REPO}/openecomp/${EP_TAG_NAME}:${VERSION}"
-DB_VERSION="${REPO}/openecomp/${DB_TAG_NAME}:${VERSION}"
-WMS_VERSION="${REPO}/openecomp/${WMS_TAG_NAME}:${VERSION}"
-
-APPS_LATEST="${REPO}/openecomp/${EP_TAG_NAME}:${LATEST}"
-DB_LATEST="${REPO}/openecomp/${DB_TAG_NAME}:${LATEST}"
-WMS_LATEST="${REPO}/openecomp/${WMS_TAG_NAME}:${LATEST}"
-
-# tag versions
-docker tag ${EP_IMG_NAME} ${APPS_VERSION}
-docker tag ${EP_IMG_NAME} ${APPS_LATEST}
-
-docker tag ${DB_IMG_NAME} ${DB_VERSION}
-docker tag ${DB_IMG_NAME} ${DB_LATEST}
-
-docker tag ${WMS_IMG_NAME} ${WMS_VERSION}
-docker tag ${WMS_IMG_NAME} ${WMS_LATEST}
-
-# push
-docker push ${APPS_VERSION}
-docker push ${APPS_LATEST}
-
-docker push ${DB_VERSION}
-docker push ${DB_LATEST}
+export VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}"
+export LATEST="latest"
 
-docker push ${WMS_VERSION}
-docker push ${WMS_LATEST}
+exec ./os_docker_base.sh
-- 
cgit 1.2.3-korg