Merge pull request #1182 from coopTilleuls/fix/cve-2024-22189

Fix/CVE 2024 22189
coopTilleuls · May 17, 2024 · ebfb9cd · ebfb9cd
2 parents f6716a5 + 005419b
commit ebfb9cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.trivyignore b/.trivyignore
@@ -1 +1 @@
-
+CVE-2024-22189
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -101,14 +101,14 @@ RUN set -eux; \
 RUN rm -f .env.local.php
 
 # Build Caddy with the Mercure and Vulcain modules
-FROM caddy:2.7.6-builder-alpine AS app_caddy_builder
+FROM caddy:2.7-builder-alpine AS app_caddy_builder
 
 RUN xcaddy build v2.7.6 \
 	--with github.com/dunglas/mercure/caddy \
 	--with github.com/dunglas/vulcain/caddy
 
 # Caddy image
-FROM caddy:2.7.6-alpine AS app_caddy
+FROM caddy:2-alpine AS app_caddy
 
 # needed for security update until base image is updated
 RUN apk upgrade libcurl curl openssl openssl-dev libressl libcrypto1.1 libssl1.1 libcrypto3 libssl3