branch develop updated (5c96d6a1 -> 85d1e957)
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 5c96d6a1 ref #365 - Fix wrong values displayed for add choices begin and end date new 055cfe8d Optimisation image Docker new 85d1e957 Refaire marcher sonar_job The 2 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 85d1e9571103b692714aafa0af4c85cbbcd2d2e3 Author: Andrés Maldonado <maldonado@codelutin.com> Date: Fri May 6 12:12:58 2022 +0200 Refaire marcher sonar_job commit 055cfe8d731aec5df9921d1006e33d5eed468320 Author: Andrés Maldonado <maldonado@codelutin.com> Date: Fri May 6 12:03:00 2022 +0200 Optimisation image Docker Summary of changes: .gitlab-ci.yml | 2 +- Dockerfile | 11 +++++------ 2 files changed, 6 insertions(+), 7 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 055cfe8d731aec5df9921d1006e33d5eed468320 Author: Andrés Maldonado <maldonado@codelutin.com> Date: Fri May 6 12:03:00 2022 +0200 Optimisation image Docker --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e9b67c24..92b793a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,14 @@ # use with: # docker build --file Dockerfile-snapshot -t docker.codelutin.com/pollen . # docker run -p 80:80 -FROM tomcat:8.5 +FROM tomcat:8.5-jdk11-openjdk-slim-bullseye COPY ./docker/server.xml /usr/local/tomcat/conf/server.xml -RUN apt-get update && apt-get -y install apache2 && apt-get clean\ - && a2enmod proxy_ajp && a2enmod rewrite +RUN apt-get update && \ + apt-get install -y --no-install-recommends apache2 && \ + rm -rf /var/lib/apt/lists/* && \ + a2enmod proxy_ajp rewrite RUN echo '\ CATALINA_OPTS="-Xms512m -Xmx512m"\n\ @@ -52,9 +54,6 @@ RUN mv /var/www/html/customData /var/local/pollen/customData && ln -s /var/loca # 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>.
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 85d1e9571103b692714aafa0af4c85cbbcd2d2e3 Author: Andrés Maldonado <maldonado@codelutin.com> Date: Fri May 6 12:12:58 2022 +0200 Refaire marcher sonar_job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34141076..47817008 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,7 +110,7 @@ release: name: "${CI_PROJECT_NAME}-${CI_COMMIT_REF_NAME}" sonar_job: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release-with-frequent-libraries + image: maven:3.8-openjdk-11-slim stage: sonar script: - mvn -e -X clean -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm