Support for docker-compose in heat environment

[so.git] / packages / docker / src / main / docker / docker-files / Dockerfile.so-app

diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app
index 27c6b58..69b88d8 100644 (file)
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app
@@ -7,16 +7,27 @@ ARG https_proxy
 ENV HTTPS_PROXY=$https_proxy
 ENV https_proxy=$HTTPS_PROXY
 
-RUN mkdir /app
+RUN mkdir /app && mkdir /app/config && mkdir /app/certificates && mkdir /app/logs
 
 COPY maven/app.jar /app
 COPY configs/logging/logback-spring.xml /app
-COPY scripts/startService.sh /app
+COPY scripts/start-app.sh /app
+COPY scripts/wait-for.sh /app
 
-RUN chown -R so:so /app && chmod 700 /app/startService.sh
+RUN chown -R so:so /app && chmod 700 /app/*.sh
 
-VOLUME /tmp
+## TODO for Casablanca: install this in the openstack-adapter container
+## Install heatbridge
+#RUN apt-get install -y python && apt-get install -y python-pip && echo 'PIP Installed, doing upgrade' && pip install --upgrade pip
+#RUN mkdir /opt/mso/heatbridge
+#COPY heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl /opt/mso/heatbridge
+#RUN pip install /opt/mso/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl
+
+# Springboot configuration (required)
+VOLUME /app/config
+
+#  Root certificates (optional)
+VOLUME /app/ca-certificates
 
 WORKDIR /app
-USER so:so
-ENTRYPOINT /app/startService.sh
+CMD ["/app/start-app.sh"]