X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_docker_push.sh;h=0978ad834412c551a1b72c976d5e532eacdc2b41;hb=83de9db899ebf7ec87220670d6f5cf35a10d087b;hp=2ec6de422f53f0a979971a814a5985017ac3a5be;hpb=6f588d5a78f6baabb7c96aebbfd2fcfb443e5802;p=portal.git

diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index 2ec6de42..0978ad83 100755
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -1,40 +1,23 @@
 #!/bin/bash
+# Builds and pushes SNAPSHOT versions of Portal images
 
-# Establish environment variables
-source $(dirname $0)/os_settings.sh
+# be verbose
+set -x
 
-./run.sh
+# Establish environment variables
+source $(dirname $0)/.env
 
-REPO="nexus3.onap.org:10003"
+if [ -z "$PORTAL_VERSION" ]; then
+    echo "PORTAL_VERSION not set"
+    exit 1
+fi
 
 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}
+# commenting the following two configurations as lf team preferred the uncommented format below
+#export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
+#export LATEST="latest"
 
-docker push ${DB_VERSION}
-docker push ${DB_LATEST}
+export VERSION="${PORTAL_VERSION}-STAGING-${TIMESTAMP}"
+export LATEST="${PORTAL_VERSION}-STAGING-latest"
 
-docker push ${WMS_VERSION}
-docker push ${WMS_LATEST}
+exec ./os_docker_base.sh