From a7f9717b02c14380906b012156ce146712cb01ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A8ve=20Caillault?= <steve.caillault@gmail.com>
Date: Sun, 1 Mar 2026 10:39:26 +0100
Subject: [PATCH] Correctif dans le Dockerfile de FrankenPHP pour la
 configuration de Composer, NPM et de l'utilisateur www-data.

---
 docker-compose.dev.yml        |  5 +++++
 docker-compose.frankenphp.yml |  5 +++++
 docker/Dockerfile.frankenphp  | 28 ++++++++++++++++------------
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..2bbc5cf
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,5 @@
+services:
+  server-php:
+    # Pour Vite notamment
+    ports:
+      - "${VITE_PORT}:${VITE_PORT}"
\ No newline at end of file
diff --git a/docker-compose.frankenphp.yml b/docker-compose.frankenphp.yml
index abae1c7..918d658 100644
--- a/docker-compose.frankenphp.yml
+++ b/docker-compose.frankenphp.yml
@@ -9,11 +9,16 @@ services:
 
     environment:
       FRANKENPHP_ROOT_PATH: ${FRANKENPHP_ROOT_PATH}
+      # Configuration en local
+      VITE_PORT: ${VITE_PORT}
 
     volumes:
       - ./www:/app
       - ./host/frankenphp/conf/Caddyfile:/etc/frankenphp/Caddyfile
       - ./host/php/conf/${OPCACHE_CONFIG_FILE:-opcache.default.ini}:/usr/local/etc/php/conf.d/opcache.ini
+      - ./upload:/app/public/upload
+
+    user: "${UID:-1000}:${GID:-1000}"
 
     healthcheck:
       test: [ "CMD-SHELL", "curl -s http://localhost/server-php-test.php || exit 1" ]
diff --git a/docker/Dockerfile.frankenphp b/docker/Dockerfile.frankenphp
index b137087..96dc102 100644
--- a/docker/Dockerfile.frankenphp
+++ b/docker/Dockerfile.frankenphp
@@ -1,29 +1,21 @@
 ARG FRANKENPHP_IMAGE=unknown
 ARG COMPOSER_IMAGE=composer:latest
-ARG NODE_IMAGE=node:25.6
 
 # Image composer
 FROM ${COMPOSER_IMAGE} AS php_composer
 
-# Image Node
-FROM ${NODE_IMAGE} AS node_js
-
 # Image FrankenPHP
 FROM ${FRANKENPHP_IMAGE}
 
-#WORKDIR /var/www/html
-
 # Installation de Composser
 COPY --from=php_composer /usr/bin/composer /usr/local/bin/composer
 
-# Installation de Node et NPM
-COPY --from=node_js /usr/local/bin/node /usr/local/bin/node
-COPY --from=node_js /usr/local/bin/npm /usr/local/bin/npm
-COPY --from=node_js /usr/local/lib/node_modules /usr/local/lib/node_modules
-
 RUN apt-get update && apt-get install -y \
     git \
     mariadb-client \
+    npm \
+    # Pour l'extension PHP intl
+    libicu-dev \
     # Zip
     unzip zip libzip-dev zlib1g-dev \
     # GD
@@ -33,6 +25,18 @@ RUN apt-get update && apt-get install -y \
       --with-jpeg \
       --with-webp \
       --with-avif \
-    && docker-php-ext-install zip pdo_mysql gd \
+    && docker-php-ext-install zip pdo_mysql gd sockets intl \
     && 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
+
+USER www-data
\ No newline at end of file