From a9bdde29ccd21794704b35f6ca76b83d20a57039 Mon Sep 17 00:00:00 2001
From: David Coutadeur <david.coutadeur@worteks.com>
Date: Wed, 28 Aug 2024 15:48:41 +0200
Subject: [PATCH] fix vulnerabilities in docker images (#946)

---
 packaging/docker/Dockerfile                                | 1 +
 packaging/docker/Dockerfile.alpine                         | 2 +-
 packaging/docker/apache2.alpine/self-service-password.conf | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 02085d78..a5570624 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -83,6 +83,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    apt-get purge -y linux-libc-dev gcc-12 cpp-12; \
     ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"; \
     :;
 
diff --git a/packaging/docker/Dockerfile.alpine b/packaging/docker/Dockerfile.alpine
index dfdcc3e5..9f47a907 100644
--- a/packaging/docker/Dockerfile.alpine
+++ b/packaging/docker/Dockerfile.alpine
@@ -57,7 +57,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
     apk add \
         bash \
         ca-certificates \
-        curl \
+        libcurl \
         openssl \
         tar \
         xz \
diff --git a/packaging/docker/apache2.alpine/self-service-password.conf b/packaging/docker/apache2.alpine/self-service-password.conf
index 3a0d36f5..1a4cc7fa 100644
--- a/packaging/docker/apache2.alpine/self-service-password.conf
+++ b/packaging/docker/apache2.alpine/self-service-password.conf
@@ -35,6 +35,6 @@
     </Directory>
 
     LogLevel debug
-    ErrorLog stderr
-    CustomLog stdout combined
+    ErrorLog /dev/stderr
+    CustomLog /dev/stdout combined
 </VirtualHost>