Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "pushing error and audit log changes for portal"
[portal.git]
/
deliveries
/
os_docker_release.sh
diff --git
a/deliveries/os_docker_release.sh
b/deliveries/os_docker_release.sh
index
2a22fef
..
1fb8a9a
100755
(executable)
--- a/
deliveries/os_docker_release.sh
+++ b/
deliveries/os_docker_release.sh
@@
-6,6
+6,9
@@
set -x
# Establish environment variables
source $(dirname $0)/.env
# 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"
if [ -z "$PORTAL_VERSION" ]; then
echo "PORTAL_VERSION not set"
@@
-13,7
+16,7
@@
if [ -z "$PORTAL_VERSION" ]; then
fi
TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
fi
TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-export VERSION="${PORTAL_VERSION}-
STAGING-
${TIMESTAMP}"
-export LATEST="${PORTAL_VERSION}
-STAGING-latest
"
+export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
+export LATEST="${PORTAL_VERSION}"
-exec ./os_docker_base.sh
+./os_docker_base.sh $1