This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit db156466f4fffcf8fa221bf8401c9078d52cb40e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 29 17:55:34 2017 +0200 optimisation de la construction du docker --- Dockerfile | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46faa33..ad3a934 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,6 @@ FROM tomcat:8.5 RUN apt-get update && apt-get -y install apache2 && apt-get clean\ && a2enmod proxy_ajp && a2enmod rewrite -# Prepare apache2 server -COPY ./pollen-ui-riot-js/target/dist /var/www/html -RUN mkdir -p /var/www/html/pages - RUN echo '\ <Location /pollen-rest-api/>\n\ ProxyPass "ajp://localhost:8009/"\n\ @@ -27,19 +23,8 @@ RUN echo '\ \n\ ' > /etc/apache2/conf-enabled/pollen.conf -# Prepare tomcat server -RUN rm -fr /usr/local/tomcat/webapps/ROOT -COPY ./pollen-rest-api/target/pollen-rest-api*.war /usr/local/tomcat/webapps/ROOT.war -RUN unzip /usr/local/tomcat/webapps/ROOT.war -d /usr/local/tomcat/webapps/ROOT - # Prepare pollen directory -RUN mkdir /var/local/pollen -RUN mkdir /var/local/pollen/db -RUN mkdir /var/local/pollen/images - -# riot UI config -RUN mv /var/www/html/conf.js /var/local/pollen/conf.js -RUN ln -s /var/local/pollen/conf.js /var/www/html/conf.js +RUN mkdir -p /var/local/pollen/db /var/local/pollen/images /var/www/html/pages # Add rest config RUN echo "\ @@ -47,7 +32,18 @@ RUN echo "\ pollen.data.directory=/var/local/pollen/db\n\ \n\ " > /var/local/pollen/pollen-rest-api.properties -RUN ln -s /var/local/pollen/pollen-rest-api.properties /usr/local/tomcat/pollen-rest-api.properties +RUN ln -s /var/local/pollen/pollen-rest-api.properties /etc/pollen-rest-api.properties + +# Prepare apache2 server +COPY ./pollen-ui-riot-js/target/dist /var/www/html + +# riot UI config +RUN mv /var/www/html/conf.js /var/local/pollen/conf.js && ln -s /var/local/pollen/conf.js /var/www/html/conf.js + +# Prepare tomcat server +RUN rm -fr /usr/local/tomcat/webapps/ROOT +COPY ./pollen-rest-api/target/pollen-rest-api*.war /usr/local/tomcat/webapps/ROOT.war +RUN unzip /usr/local/tomcat/webapps/ROOT.war -d /usr/local/tomcat/webapps/ROOT EXPOSE 80 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.