Extend deployment for CSIT env quirks
[portal.git] / deliveries / Dockerfile.portalapps
index c9fab4d..b1bf88c 100644 (file)
@@ -25,9 +25,6 @@ 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
@@ -61,7 +58,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