Update taskfiles with apache update

Author: koromerzhin

Taskfile.yml

@@ -10,6 +10,7 @@ includes:
   env: ./taskfiles/env/Taskfile.yml
   nodejs: ./taskfiles/nodejs/Taskfile.yml
   download: ./taskfiles/download/Taskfile.yml
+  apache: ./taskfiles/apache/Taskfile.yml
 
 vars:
   # Variables avec valeurs par défaut depuis .env ou valeurs de fallback
@@ -59,23 +60,23 @@ tasks:
     silent: true
     cmds:
     - rm -rf ./conf/apache2 || true
-    - docker create --name phpfpm-php koromerzhin/php:8.4.3-apache
     - mkdir -p ./conf/apache2
-    - docker cp phpfpm-php:/etc/apache2/sites-available/000-default.conf ./conf/apache2/000-default.conf
-    - docker cp phpfpm-php:/etc/apache2/apache2.conf ./conf/apache2/apache2.conf
+    - task docker:create CONTAINER_NAME=phpfpm-php IMAGE_NAME=$(awk '/www:/ {f=1} f && /image:/ {print $2; exit}' {{.DOCKERCOMPOSEFILE}})
+    - task: docker:getfile
+      vars:
+        CONTAINER_NAME: "phpfpm-php"
+        FILE_PATH: "/etc/apache2/sites-available/000-default.conf"
+        DEST_PATH: "./conf/apache2/000-default.conf"
+    - task: docker:getfile
+      vars:
+        CONTAINER_NAME: "phpfpm-php"
+        FILE_PATH: "/etc/apache2/apache2.conf"
+        DEST_PATH: "./conf/apache2/apache2.conf"
     - docker rm -f phpfpm-php
-
-    - sed -ri -e 's|\$\{APACHE_DOCUMENT_ROOT\}|/var/www/public|g' ./conf/apache2/000-default.conf
-    - sed -ri -e 's|#ServerName www.example.com|ServerName {{.SERVERNAME}}|g' ./conf/apache2/000-default.conf
-    - sed -ri -e 's|\$\{APACHE_DOCUMENT_ROOT\}|/var/www/public|g' ./conf/apache2/apache2.conf
-    - |
-      sed -i '/^# Global configuration/a\
-      #\
-      # ServerName: Set the servers fully qualified domain name globally\
-      # This suppresses the warning about not being able to reliably determine\
-      # the servers fully qualified domain name\
-      #\
-      ServerName {{.SERVERNAME}}' ./conf/apache2/apache2.conf
+    - task: apache:updateconfig
+      vars:
+        SERVERNAME: "{{.SERVERNAME}}"
+        APACHE_DOCUMENT_ROOT: "/var/www/public"
 
   phpfpm:copysql:
     desc: "Copie le fichier SQL de dump dans le dossier phpfpm"
@@ -108,7 +109,7 @@ tasks:
     desc: "Installation initiale de Composer et des dépendances"
     silent: true
     cmds:
-    - docker run --rm -v $(pwd)/apps:/var/www -w /var/www koromerzhin/php:8.4.3-apache composer install
+    - docker run --rm -v $(pwd)/apps:/var/www -w /var/www $(pwd)/apps:/var/www -w /var/www $(awk '/www:/ {f=1} f && /image:/ {print $2; exit}' {{.DOCKERCOMPOSEFILE}}) composer install
 
   phpfpm:waiting:
     desc: "Attend que les services soient opérationnels"