Skip to content

Commit

Permalink
Merge pull request #2427 from mapfish/backport/2422-to-3.29
Browse files Browse the repository at this point in the history
[Backport 3.29] Update the package from the based image
  • Loading branch information
sbrunner committed May 13, 2022
2 parents 5e6bef5 + a582a29 commit 57dd685
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/Dockerfile
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

0 comments on commit 57dd685

Please sign in to comment.