From 764405bc00dd938b54c5a641ddab01f1d67ad861 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 18 Oct 2017 16:04:10 -0400
Subject: Revise domain name and app context paths

Now uses host simpledemo.onap.org (no more simpledemo.openecomp.org)
and context path ONAPPORTAL (no more ECOMPPORTAL).

Issue: PORTAL-130
Change-Id: I15a47eae10ed444b8bfc5ba33a8a33a25d5c6ec6
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 deliveries/Dockerfile.portalapps | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'deliveries/Dockerfile.portalapps')

diff --git a/deliveries/Dockerfile.portalapps b/deliveries/Dockerfile.portalapps
index f1526597..17677aa8 100644
--- a/deliveries/Dockerfile.portalapps
+++ b/deliveries/Dockerfile.portalapps
@@ -18,6 +18,8 @@ ARG HTTPS_PROXY
 ARG TOMCAT=apache-tomcat-8.0.37
 ARG TOMCATTAR=${TOMCAT}.tar.gz
 ARG TOMCATHOME=/opt/${TOMCAT}
+ARG PORTALCONTEXT=ONAPPORTAL
+ARG SDKCONTEXT=ONAPPORTALSDK
 
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
@@ -35,16 +37,16 @@ RUN mkdir -p /opt
 RUN mv ${TOMCAT} /opt
 
 WORKDIR ${TOMCATHOME}/webapps
-RUN mkdir ECOMPPORTAL && mkdir ECOMPSDKAPP
+RUN mkdir ${PORTALCONTEXT} && mkdir ${SDKCONTEXT}
 
 # Portal has many parts
-COPY $PORTAL_WAR ECOMPPORTAL
-RUN cd ECOMPPORTAL && unzip -q *.war && rm *.war
-COPY ${FE_DIR} ECOMPPORTAL/public
+COPY $PORTAL_WAR ${PORTALCONTEXT}
+RUN cd ${PORTALCONTEXT} && unzip -q *.war && rm *.war
+COPY ${FE_DIR} ${PORTALCONTEXT}/public
 
 # SDK app has only a war
-COPY $SDK_WAR ECOMPSDKAPP
-RUN cd ECOMPSDKAPP && unzip -q *.war && rm *.war
+COPY $SDK_WAR ${SDKCONTEXT}
+RUN cd ${SDKCONTEXT} && unzip -q *.war && rm *.war
 
 VOLUME ${TOMCATHOME}/logs
 
-- 
cgit 1.2.3-korg