From 77564fe7a22c70b3530b8333af6b2f76c37f3005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Bouch=C3=A9?= <clement.bouche@ign.fr>
Date: Tue, 3 Dec 2024 08:18:22 +0000
Subject: [PATCH] docker: fix apache foreground

---
 .docker/apache2-foreground | 10 +---------
 .docker/application.sh     |  6 ------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/.docker/apache2-foreground b/.docker/apache2-foreground
index b662e4e..3748df0 100644
--- a/.docker/apache2-foreground
+++ b/.docker/apache2-foreground
@@ -3,16 +3,8 @@ set -e
 
 # Adapted from docker/php removing folders creation at runtime (requires root)
 # src : https://github.com/docker-library/php/blob/master/8.3/bullseye/apache/apache2-foreground
+source /etc/apache2/envvars
 
-: "${APACHE_CONFDIR:=/etc/apache2}"
-: "${APACHE_ENVVARS:=$APACHE_CONFDIR/envvars}"
-if test -f "$APACHE_ENVVARS"; then
-	. "$APACHE_ENVVARS"
-fi
-
-# Apache gets grumpy about PID files pre-existing
-: "${APACHE_RUN_DIR:=/var/run/apache2}"
-: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
 rm -f "$APACHE_PID_FILE"
 
 # Start apache forwarding SIGINT and SIGTERM to SIGWINCH
diff --git a/.docker/application.sh b/.docker/application.sh
index 774457c..58edf6f 100755
--- a/.docker/application.sh
+++ b/.docker/application.sh
@@ -26,12 +26,6 @@ run(){
         bin/console doctrine:schema:update --force --complete
     fi
 
-    # Ensure apache2 can read /etc/apache2/envvars
-    # if not we got the following error
-    # apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot
-    mkdir -p /var/run/apache2
-    source /etc/apache2/envvars
-
     #---------------------------------------------------------------------------
     # start apache2 server
     #---------------------------------------------------------------------------