Prepare to deploy widget-ms docker container in Rackspace

Restore hardcoded image name ep:1610-1 due to demo/boot
script file dependencies.
Store image and container names in settings file;
push and tag image for WMS at same time as portal and db.

Issue: PORTAL-30
Change-Id: I349bfb91676dda0b4f106c6cab784dc6e6cec647
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 19 insertions, 6 deletions

diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index 04e245cd..2c41151d 100755
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Establish environment variables
+source $(dirname $0)/os_settings.sh
+
 ./run.sh
 
 REPO="nexus3.onap.org:10003"
@@ -10,18 +13,28 @@ LATEST="latest"
 
 APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}"
 DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}"
+WMS_VERSION="${REPO}/openecomp/portalwms:${VERSION}"
 
 APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}"
 DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}"
+WMS_LATEST="${REPO}/openecomp/portalwms:${LATEST}"
+
+# tag versions
+docker tag ${EP_IMG_NAME} ${APPS_VERSION}
+docker tag ${EP_IMG_NAME} ${APPS_LATEST}
 
-# tag version
-docker tag ep:1610-1 ${APPS_VERSION}
-docker tag ecompdb:portal ${DB_VERSION}
-docker tag ep:1610-1 ${APPS_LATEST}
-docker tag ecompdb:portal ${DB_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 ${DB_VERSION}
 docker push ${APPS_LATEST}
+
+docker push ${DB_VERSION}
 docker push ${DB_LATEST}
+
+docker push ${WMS_VERSION}
+docker push ${WMS_LATEST}