X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_docker_release.sh;h=1fb8a9a564d9898c6639658c8dd0ba573b84589d;hb=8e83c25788017acd56271a72286f7dcbc974e76d;hp=ba4ba2356e70334c6df0b539229679fa89096c72;hpb=6a62e917a5f9f6a69fe8e1f56c29abd9d98cba37;p=portal.git

diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
old mode 100644
new mode 100755
index ba4ba235..1fb8a9a5
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -1,27 +1,22 @@
 #!/bin/bash
+# Builds and pushes STAGING versions of Portal images
 
-./run.sh
+# be verbose
+set -x
 
-REPO="nexus3.onap.org:10003"
+# Establish environment variables
+source $(dirname $0)/.env
+if [ $1 ]; then
+  source $(dirname $0)/$1
+fi
 
-TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-VERSION="1.1.0-STAGING-${TIMESTAMP}"
-LATEST="1.1-STAGING-latest"
-
-APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}"
-DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}"
+if [ -z "$PORTAL_VERSION" ]; then
+    echo "PORTAL_VERSION not set"
+    exit 1
+fi
 
-APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}"
-DB_LATEST="${REPO}/openecomp/portaldb:${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}
+TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
+export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
+export LATEST="${PORTAL_VERSION}"
 
-# push
-docker push ${APPS_VERSION}
-docker push ${DB_VERSION}
-docker push ${APPS_LATEST}
-docker push ${DB_LATEST}
+./os_docker_base.sh $1