-
Notifications
You must be signed in to change notification settings - Fork 416
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2427 from mapfish/backport/2422-to-3.29
[Backport 3.29] Update the package from the based image
- Loading branch information
Showing
1 changed file
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>" | ||
|
||
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" && \ | ||
|
@@ -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 && \ | ||
|