Merge "Disable portal-app default page"

[portal.git] / deliveries / Dockerfile.portal

diff --git a/deliveries/Dockerfile.portal b/deliveries/Dockerfile.portal
index 81eeb65..a2a143c 100644 (file)
--- a/deliveries/Dockerfile.portal
+++ b/deliveries/Dockerfile.portal
@@ -11,6 +11,7 @@ ARG PORTAL_WAR=build/ecompportal-be-os.war
 ARG FE_DIR=build/public
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
+# ARG PORTAL_CERT=truststoreONAPall.jks
 
 # Just variables, never passed in
 ARG TOMCAT=apache-tomcat-8.0.37
@@ -29,8 +30,9 @@ RUN wget -q http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin/apache-to
 RUN tar -xzf ${TOMCATTAR}
 RUN rm ${TOMCATTAR}
 # Remove manager and sample apps
-RUN rm -fr ${TOMCAT}/webapps/[a-z]*
+RUN rm -fr ${TOMCAT}/webapps/*
 RUN mkdir -p /opt
+COPY ${SERVERXML} ${TOMCAT}/conf
 RUN mv ${TOMCAT} /opt
 
 WORKDIR ${TOMCATHOME}/webapps