Mise à jour de la configuration pour Apache.

.env.example

@@ -17,11 +17,12 @@ DATABASE_IMAGE="mariadb:12"
 DATABASE_ROOT_PASSWORD=""
 
 # Apache et PHP
-APACHE_PHP_VERSION="php:8.5-apache"
+APACHE_PHP_IMAGE="php:8.5-apache"
 APACHE_ADMIN_EMAIL=""
+APACHE_ROOT_PATH="/var/www/html"
 
 # FrankenPHP
-FRANKENPHP_VERSION="dunglas/frankenphp:1.11.2-php8.5"
+FRANKENPHP_IMAGE="dunglas/frankenphp:1.11.2-php8.5"
 FRANKENPHP_ROOT_PATH="/app/"
 
 # Nom du fichier de configuration OPcache à utiliser

docker/Dockerfile.server-php

@@ -1,15 +1,21 @@
-ARG FRANKENPHP_IMAGE=unknown
+ARG SERVER_PHP_IMAGE=unknown
 ARG COMPOSER_IMAGE=composer:latest
 
 # Image composer
 FROM ${COMPOSER_IMAGE} AS php_composer
 
-# Image FrankenPHP
-FROM ${FRANKENPHP_IMAGE}
+# Image du serveur PHP à utiliser (Apache, FrankenPHP...)
+FROM ${SERVER_PHP_IMAGE}
 
 # Installation de Composser
 COPY --from=php_composer /usr/bin/composer /usr/local/bin/composer
 
+# Activation du mode rewrite d'Apache
+ARG SERVER_PHP_IMAGE
+RUN if echo "$SERVER_PHP_IMAGE" | grep -qi apache; then \
+      a2enmod rewrite headers; \
+    fi
+
 RUN apt-get update && apt-get install -y \
     git \
     mariadb-client \

docker/docker-compose.apache-php.yml

@@ -1,13 +1,24 @@
 services:
 
   server-php:
-    image: ${APACHE_PHP_VERSION}
+    build:
+      context: .
+      args:
+        SERVER_PHP_IMAGE: ${APACHE_PHP_IMAGE}
+      dockerfile: ${PWD}/docker/Dockerfile.server-php
     
     environment:
-      - APACHE_ADMIN_EMAIL=${APACHE_ADMIN_EMAIL}
+      APACHE_ADMIN_EMAIL: ${APACHE_ADMIN_EMAIL}
+      APACHE_ROOT_PATH: ${APACHE_ROOT_PATH}
+      # Configuration en local
+      VITE_PORT: ${VITE_PORT}
 
     volumes:
       - ${PWD}/www:/var/www/html
       - ${PWD}/host/apache/logs:/var/log/apache2
       - ${PWD}/host/apache/conf/vhost.conf:/etc/apache2/sites-available/000-default.conf
-      - ${PWD}/host/apache/conf/apache2.conf:/etc/apache2/conf-enabled/docker.conf
+      - ${PWD}/host/apache/conf/apache2.conf:/etc/apache2/conf-enabled/docker.conf
+      - ${PWD}/host/php/conf/${OPCACHE_CONFIG_FILE:-opcache.default.ini}:/usr/local/etc/php/conf.d/opcache.ini
+      - ${PWD}/upload:/app/public/upload
+
+    user: "${UID:-1000}:${GID:-1000}"

docker/docker-compose.frankenphp.yml

@@ -4,8 +4,8 @@ services:
     build:
       context: .
       args:
-        FRANKENPHP_IMAGE: ${FRANKENPHP_VERSION}
-      dockerfile: ${PWD}/docker/Dockerfile.frankenphp
+        SERVER_PHP_IMAGE: ${FRANKENPHP_IMAGE}
+      dockerfile: ${PWD}/docker/Dockerfile.server-php
 
     environment:
       FRANKENPHP_ROOT_PATH: ${FRANKENPHP_ROOT_PATH}

host/apache/conf/vhost.conf

@@ -1,7 +1,9 @@
 <VirtualHost *:80>
     ServerAdmin ${APACHE_ADMIN_EMAIL}
 
-    <Directory /var/www/html>
+    DocumentRoot ${APACHE_ROOT_PATH}
+
+    <Directory ${APACHE_ROOT_PATH}>
         Options -Indexes +FollowSymLinks
         AllowOverride All
     </Directory>