Merge pull request #3374 from mapfish/audit-3.29

Use a maintained Tomcat Docker image

.github/workflows/main.yaml

@@ -80,10 +80,10 @@ jobs:
       - run: docker cp builder:/src/core/build/ core/build/ || true
         if: always()
 
-      - run: docker cp mapfish-print_tests_1:/src/examples/build/ examples/build/ || true
+      - run: docker cp mapfish-print-tests-1:/src/examples/build/ examples/build/ || true
         if: always()
 
-      - run: docker-compose logs || true
+      - run: docker compose logs || true
         if: failure()
 
       - run: mkdir -p core/build/resources/actual examples/build/reports core/build/reports examples/build/resources/test/examples

Makefile

@@ -14,7 +14,7 @@ build:
 
 .PHONY: acceptance-tests-up
 acceptance-tests-up:
-	docker-compose down --remove-orphan
+	docker compose down
 
 	mkdir /tmp/geoserver-data || true
 	docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
@@ -23,17 +23,17 @@ acceptance-tests-up:
 	cp -r examples/geoserver-data/* /tmp/geoserver-data/
 	cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/
 
-	docker-compose up -d
+	docker compose up -d
 
 .PHONY: acceptance-tests-run
 acceptance-tests-run:
-	docker-compose exec -T tests gradle :examples:integrationTest
+	docker compose exec -T tests gradle :examples:integrationTest
 	ci/check-fonts
 	ci/validate-container
 
 .PHONY: acceptance-tests-down
 acceptance-tests-down:
-	docker-compose down || true
+	docker compose down || true
 	docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
 		bash -c 'rm -rf /mnt/geoserver_datadir/*'
 	rmdir /tmp/geoserver-data

core/Dockerfile

@@ -1,7 +1,7 @@
 FROM mapfish_print_builder AS builder
 
 
-FROM tomcat:9.0.65-jdk11-openjdk-slim-bullseye AS runner
+FROM tomcat:9.0.93-jdk11-temurin-jammy 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" && \

core/build.gradle

@@ -151,8 +151,7 @@ dependencies {
             "io.dropwizard.metrics:metrics-servlets:$metricsVersion",
             "io.dropwizard.metrics:metrics-jvm:$metricsVersion",
             "io.dropwizard.metrics:metrics-jmx:$metricsVersion",
-            "io.dropwizard.metrics:metrics-logback:$metricsVersion",
-            'com.readytalk:metrics3-statsd:4.2.0'
+            "io.dropwizard.metrics:metrics-logback:$metricsVersion"
     )
     geotools(
             "org.geotools:gt-epsg-hsql:$geotoolsVersion",

core/src/main/resources/mapfish-spring-application-context.xml

@@ -66,7 +66,6 @@
     <bean id="loggingMetricsConfigurator" class="org.mapfish.print.metrics.LoggingMetricsConfigurator" lazy-init="false"/>
     <bean id="jvmMetricsConfigurator" class="org.mapfish.print.metrics.JvmMetricsConfigurator" lazy-init="false"/>
     <bean id="jmxMetricsReporter" class="org.mapfish.print.metrics.JmxMetricsReporter" lazy-init="false"/>
-    <bean id="statsDReporterInit" class="org.mapfish.print.metrics.StatsDReporterInit" lazy-init="false"/>
     <bean id="accounting" class="org.mapfish.print.servlet.job.Accounting" lazy-init="false"/>
 
     <bean id="forkJoinPool" class="java.util.concurrent.ForkJoinPool" destroy-method="shutdownNow">