From 0f81951a59b807497ab6af17911d680e1ef0dcfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A8ve=20Caillault?= <steve.caillault@gmail.com>
Date: Mon, 8 Jun 2026 19:45:32 +0200
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20l'image=20du=20serv?=
 =?UTF-8?q?eur=20=C3=A0=20utiliser=20pour=20optimiser=20le=20temps=20de=20?=
 =?UTF-8?q?construction=20de=20l'image=20Docker.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                 |  4 +--
 docker/server-php.dockerfile | 63 +-----------------------------------
 2 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/.env.example b/.env.example
index 8c1b652..fb4c7a0 100644
--- a/.env.example
+++ b/.env.example
@@ -44,12 +44,12 @@ APP_HOST_PATH="www"
 APP_CONTAINER_PATH="/var/www/html"
 
 # Apache et PHP
-APACHE_PHP_IMAGE="php:8.5-apache"
+APACHE_PHP_IMAGE="steve-caillault/php:8.5-apache-2.4"
 APACHE_ADMIN_EMAIL=""
 APACHE_ROOT_PATH="/var/www/html"
 
 # FrankenPHP
-FRANKENPHP_IMAGE="dunglas/frankenphp:1.11.2-php8.5"
+FRANKENPHP_IMAGE="steve-caillault/php:8.5-frankenphp-1.11.2"
 FRANKENPHP_ROOT_PATH="/app/"
 
 # Image du serveur PHP
diff --git a/docker/server-php.dockerfile b/docker/server-php.dockerfile
index a69ec6a..b53b9f6 100644
--- a/docker/server-php.dockerfile
+++ b/docker/server-php.dockerfile
@@ -1,65 +1,4 @@
 ARG SERVER_PHP_IMAGE=unknown
-ARG COMPOSER_IMAGE=composer:latest
-
-# Image Composer
-FROM ${COMPOSER_IMAGE} AS php_composer
 
 # Image du serveur PHP à utiliser (Apache, FrankenPHP...)
-FROM ${SERVER_PHP_IMAGE}
-
-# Installation de Composer
-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 \
-    nano \
-    git \
-    mariadb-client \
-    npm \
-    # Pour l'extension PHP intl
-    libicu-dev \
-    # Zip
-    unzip zip libzip-dev zlib1g-dev \
-    # GD
-    libpng-dev libjpeg-dev libwebp-dev libavif-dev libfreetype6-dev \
-    && docker-php-ext-configure gd \
-      --with-freetype \
-      --with-jpeg \
-      --with-webp \
-      --with-avif \
-    && docker-php-ext-install zip pdo_mysql gd sockets intl \
-    # Installation de PIE (PHP Installer for Extensions : https://github.com/php/pie)
-    && curl -fL --output /tmp/pie.phar https://github.com/php/pie/releases/latest/download/pie.phar \
-    && mv /tmp/pie.phar /usr/local/bin/pie \
-    && chmod +x /usr/local/bin/pie
-
-# Installation de Memcached
-ARG WITH_MEMCACHED=false
-RUN if [ "$WITH_MEMCACHED" = "true" ]; then \
-    apt-get install -y libmemcached-dev; \
-    pie install php-memcached/php-memcached; \
-    fi
-
-# Installation de Redis
-ARG WITH_REDIS=false
-RUN if [ "$WITH_REDIS" = "true" ]; then \
-    pie install phpredis/phpredis; \
-    fi
-
-RUN apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN usermod -u 1000 www-data && groupmod -g 1000 www-data
-
-# Configuration pour Composer
-RUN mkdir -p /var/www/.cache/composer && chown -R www-data:www-data /var/www/.cache
-ENV COMPOSER_CACHE_DIR=/var/www/.cache/composer
-
-# Configuration de NPM
-RUN mkdir -p /var/www/.npm && chown -R www-data:www-data /var/www/.npm
-ENV NPM_CONFIG_CACHE=/var/www/.npm
\ No newline at end of file
+FROM ${SERVER_PHP_IMAGE}
\ No newline at end of file