diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-10 15:54:38 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-10 15:55:51 -0400 |
| commit | 6a4a349a1be3ad5460e507dc4e2098936fd23859 (patch) | |
| tree | ea66e04551023fe6b5cc49fa7c9f3d504a815a86 /deliveries/Dockerfile.portalapps | |
| parent | 18f397918fb3139902e131772af6f400a7692e6f (diff) | |
Extend deployment for CSIT env quirks
Define new environment variables so a host IP and name can be
added to a docker container /etc/hosts file for inter-app comms
using the semi-well-known name portal.api.simpledemo.openecomp.org
Issue: PORTAL-59
Change-Id: If1c23a77a4b227aac314d966f41e5d5aaad846f8
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'deliveries/Dockerfile.portalapps')
| -rw-r--r-- | deliveries/Dockerfile.portalapps | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deliveries/Dockerfile.portalapps b/deliveries/Dockerfile.portalapps index c9fab4db..b1bf88c5 100644 --- a/deliveries/Dockerfile.portalapps +++ b/deliveries/Dockerfile.portalapps @@ -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 |