Merge "Update mariaDB version in portal-db Dockerfile"

[portal.git] / deliveries / os_docker_push.sh

diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index 3903519..1d1f329 100755 (executable)
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -6,6 +6,9 @@ set -x
 
 # Establish environment variables
 source $(dirname $0)/.env
+if [ $1 ]; then
+  source $(dirname $0)/$1
+fi
 
 if [ -z "$PORTAL_VERSION" ]; then
     echo "PORTAL_VERSION not set"
@@ -13,7 +16,11 @@ if [ -z "$PORTAL_VERSION" ]; then
 fi
 
 TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
-export LATEST="latest"
+# commenting the following two configurations as lf team preferred the uncommented format below
+#export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
+#export LATEST="latest"
+
+export VERSION="${PORTAL_VERSION}-STAGING-${TIMESTAMP}"
+export LATEST="${PORTAL_VERSION}-STAGING-latest"
 
-exec ./os_docker_base.sh
+./os_docker_base.sh $1