Merge "use docker-compose healtcheck for DB"

[portal.git] / deliveries / Dockerfile.portalapps

diff --git a/deliveries/Dockerfile.portalapps b/deliveries/Dockerfile.portalapps
index c9fab4d..17677aa 100644 (file)
--- a/deliveries/Dockerfile.portalapps
+++ b/deliveries/Dockerfile.portalapps
@@ -1,5 +1,5 @@
 # Dockerfile for image with ONAP applications:
-# Portal app, Portal-SDK app, Portal-DBC app.
+# Portal app, Portal-SDK app.
 
 # Yields an image 823 MB
 FROM frolvlad/alpine-oraclejdk8:slim
@@ -11,7 +11,6 @@ FROM frolvlad/alpine-oraclejdk8:slim
 ARG PORTAL_WAR=build/ecompportal-be-os.war
 ARG FE_DIR=build/public
 ARG SDK_WAR=build/epsdk-app-os.war
-ARG DBC_WAR=build/dmaap-bc-app-os.war
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
 
@@ -19,15 +18,14 @@ 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
 RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \
     if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
 
-# Install the wait script
-COPY wait-for.sh /
-
 # Install Tomcat.  This image already has curl.
 WORKDIR /tmp
 RUN wget -q http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin/apache-tomcat-8.0.37.tar.gz
@@ -39,20 +37,16 @@ RUN mkdir -p /opt
 RUN mv ${TOMCAT} /opt
 
 WORKDIR ${TOMCATHOME}/webapps
-RUN mkdir ECOMPPORTAL && mkdir ECOMPSDKAPP && mkdir ECOMPDBCAPP
+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
-
-# DBC app has only a war
-COPY $DBC_WAR ECOMPDBCAPP
-RUN cd ECOMPDBCAPP && unzip -q *.war && rm *.war
+COPY $SDK_WAR ${SDKCONTEXT}
+RUN cd ${SDKCONTEXT} && unzip -q *.war && rm *.war
 
 VOLUME ${TOMCATHOME}/logs
 
@@ -61,7 +55,10 @@ WORKDIR /
 
 # Define commonly used ENV variables
 ENV PATH $PATH:$JAVA_HOME/bin:${TOMCATHOME}/bin
+# Install the wait script
+COPY wait-for.sh /
+# Install the launch script
 COPY start-apps-cmd.sh /
 
-# Define default command.
+# Define default command
 CMD /start-apps-cmd.sh