From: st782s <statta@research.att.com>
Date: Mon, 5 Feb 2018 21:14:27 +0000 (-0500)
Subject: Docker fixes
X-Git-Tag: v2.2.0~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=8bcc6f6d7a6b24f9358f897d5aad18f618fa0b95

Docker fixes

Issue-ID: PORTAL-119

Merge job failing sue to the base file not being able to pull the images
names from .env file

Change-Id: I39f31683acf695273b58c1eda06e952f365a9d33
Signed-off-by: st782s <statta@research.att.com>
---

diff --git a/deliveries/os_docker_base.sh b/deliveries/os_docker_base.sh
index 73617049..2c4a3912 100755
--- a/deliveries/os_docker_base.sh
+++ b/deliveries/os_docker_base.sh
@@ -21,6 +21,9 @@ NEXUS_REPO=nexus3.onap.org:10003
 # Build the containers
 ./build_portalapps_dockers.sh
 
+# Establish environment variables
+source $(dirname $0)/.env
+
 APPS_VERSION="${NEXUS_REPO}/${EP_IMG_NAME}:${VERSION}"
 DB_VERSION="${NEXUS_REPO}/${DB_IMG_NAME}:${VERSION}"
 WMS_VERSION="${NEXUS_REPO}/${WMS_IMG_NAME}:${VERSION}"