branch develop updated (40f44f9 -> fa55dc1)
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 40f44f9 séparation du build maven du build nodejs new fa55dc1 correction de la configuration de pollen dans le docker 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 fa55dc1e87b6bbe56afe43df344d6bc8ab5fa1bd Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Feb 28 16:59:11 2017 +0100 correction de la configuration de pollen dans le docker Summary of changes: Dockerfile | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) -- 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 fa55dc1e87b6bbe56afe43df344d6bc8ab5fa1bd Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Feb 28 16:59:11 2017 +0100 correction de la configuration de pollen dans le docker --- Dockerfile | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4eed19..069495f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY ./pollen-ui-riot-js/target/dist /var/www/html RUN mkdir -p /var/www/html/pages RUN echo '\ -<Location /backend/>\n\ +<Location /pollen-rest-api/>\n\ ProxyPass "ajp://localhost:8009/"\n\ ProxyPassReverse "ajp://localhost:8009/"\n\ </Location>\n\ @@ -34,35 +34,7 @@ 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/data - -# Add config for -RUN echo '\ -window.pollenConf = {\n\ - endPoint: "http://pollen.demo.codelutin.com/pollen-rest-api",\n\ - pollDefaultPageSize: 10,\n\ - commentDefaultPageSize: 10,\n\ - favoriteListDefaultPageSize: 15,\n\ - favoriteListMemberDefaultPageSize: 30,\n\ - defaultAlertTimeInfo: 10000,\n\ - defaultAlertTimeSuccess: 2000,\n\ - defaultAlertTimeWarning: 5000,\n\ - defaultAlertTimeError: -1,\n\ - defaultDateFormat: "shortDate",\n\ - defaultTimeFormat: "shortTime",\n\ - defaultDateTimeFormat: "short",\n\ - debugI18n: false\n\ -};\n\ -\n\ -' > /var/www/html/conf.js - -RUN echo "\ -\n\ -pollen.data.directory=/var/local/pollen\n\ -pollen.smtp.server=smtp.codelutin.com\n\ -pollen.smtp.port=25\n\ - -" > /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pollen-rest-api.properties +RUN mkdir /var/local/pollen/db EXPOSE 80 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm