Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 3.29] Update the package from the based image #2427

Merged
merged 2 commits into from
May 13, 2022
Merged

[Backport 3.29] Update the package from the based image #2427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
639ee36
More precise used image
sbrunner May 12, 2022
a582a29
Update the package from the based image
sbrunner May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM mapfish_print_builder AS builder



FROM tomcat:9.0-jdk11-openjdk-slim AS runner
FROM tomcat:9.0-jdk11-openjdk-slim-bullseye AS runner
LABEL maintainer="Camptocamp <info@camptocamp.com>"

RUN perl -0777 -i -pe 's/(<Valve className="org.apache.catalina.valves.AccessLogValve"[^>]*>)/<Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"\/>/s' "${CATALINA_HOME}/conf/server.xml" && \
Expand All @@ -15,6 +14,7 @@ RUN perl -0777 -i -pe 's/(<Valve className="org.apache.catalina.valves.AccessLog
chgrp -R root /usr/local/tomcat/conf/Catalina /usr/local/tomcat/work && \
chmod g+r /usr/local/tomcat/conf/* && \
apt-get update && \
apt-get upgrade --assume-yes && \
apt-get install --assume-yes --no-install-recommends curl \
fonts-liberation fonts-dejavu fontconfig && \
apt-get clean && \
Expand Down