branch develop updated (36f9efcf -> 587105ce)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 36f9efcf correction authentification tiers new 587105ce limitation de l'espace mémoire de l'API REST The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 587105ce50e88db70b2ec72e4a733f322af4dd8d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 26 16:27:30 2017 +0200 limitation de l'espace mémoire de l'API REST Summary of changes: Dockerfile | 6 ++++++ pollen-rest-api/pom.xml | 1 + 2 files changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 587105ce50e88db70b2ec72e4a733f322af4dd8d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 26 16:27:30 2017 +0200 limitation de l'espace mémoire de l'API REST --- Dockerfile | 6 ++++++ pollen-rest-api/pom.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4595a8f8..5fcab353 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,10 @@ RUN apt-get update && apt-get -y install apache2 && apt-get clean\ && a2enmod proxy_ajp && a2enmod rewrite RUN echo '\ +CATALINA_OPTS="-Xms512m -Xmx512m"\n\ +' > /usr/local/tomcat/bin/setenv.sh + +RUN echo '\ <Location /pollen-rest-api/>\n\ ProxyPass "ajp://localhost:8009/"\n\ ProxyPassReverse "ajp://localhost:8009/"\n\ @@ -48,6 +52,8 @@ 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 CMD (service apache2 start &); catalina.sh run diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 3095768b..77654f45 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -269,6 +269,7 @@ <path>/${defaultWebContextPath}</path> <systemProperties> <pollen.log.dir>${defaultLogDir}</pollen.log.dir> + <JAVA_OPTS>-Xms512m -Xmx512m</JAVA_OPTS> </systemProperties> <uriEncoding>UTF-8</uriEncoding> <port>8888</port> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm