From 7085aa0e1f62bbef2e05961bec346c76738cc803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Jombart?= <mickael.jombart@davikingcode.com>
Date: Sat, 20 Jul 2024 19:27:09 +0200
Subject: [PATCH] Test: docker

---
 Dockerfile              | 31 +++++++++++++++++++++----------
 config/php-fpm.conf     | 18 ++++++++++--------
 config/supervisord.conf |  4 +++-
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b6eb550..b11641f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,24 +5,35 @@ FROM php:8.1.28-fpm-alpine3.18 AS base
 RUN apk update && apk add --no-cache \
     nginx \
     supervisor \
-    bash
+    bash \
+    nano
 
 # Create necessary directories and set permissions
-RUN mkdir -p /var/run/nginx && \
-    mkdir -p /var/log/nginx && \
-    mkdir -p /var/log/supervisor && \
-    chown -R www-data:www-data /var/run/nginx && \
-    chown -R www-data:www-data /var/log/nginx && \
-    chown -R www-data:www-data /var/log/supervisor && \
-    chown -R www-data:www-data /etc/nginx && \
-    chown -R www-data:www-data /usr/sbin/nginx && \
-    chown -R www-data:www-data /usr/local/sbin/php-fpm
+RUN mkdir -p /var/run/nginx \
+    && mkdir -p /var/run/php-fpm \
+    && mkdir -p /var/log/nginx \
+    && mkdir -p /var/log/supervisor \
+    && mkdir -p /var/log/php-fpm \
+    && chown -R www-data:www-data /var/run/nginx \
+    && chown -R www-data:www-data /var/run/php-fpm \
+    && chown -R www-data:www-data /var/log/nginx \
+    && chown -R www-data:www-data /var/log/supervisor \
+    && chown -R www-data:www-data /var/log/php-fpm \
+    && chown -R www-data:www-data /etc/nginx \
+    && chown -R www-data:www-data /usr/sbin/nginx \
+    && chown -R www-data:www-data /usr/local/sbin/php-fpm \
+    && chown -R www-data:www-data /usr/local/etc/php-fpm.conf \
+    && touch /var/log/php-fpm/php-fpm.log \
+    && chown www-data:www-data /var/log/php-fpm/php-fpm.log
 
 # Copy Nginx and Supervisor configuration files
 COPY ./config/nginx.conf /etc/nginx/nginx.conf
 COPY ./config/nginx-default.conf /etc/nginx/conf.d/default.conf
 COPY ./config/supervisord.conf /etc/supervisord.conf
 
+# Copy custom PHP-FPM configuration
+COPY ./config/php-fpm.conf /usr/local/etc/php-fpm.conf
+
 # Copy PHP configuration
 COPY ./config/php.ini /usr/local/etc/php/php.ini
 
diff --git a/config/php-fpm.conf b/config/php-fpm.conf
index a1f8db4..0a23e6e 100644
--- a/config/php-fpm.conf
+++ b/config/php-fpm.conf
@@ -1,13 +1,15 @@
+[global]
+pid = /var/run/php-fpm/php-fpm.pid
+error_log = /var/log/php-fpm/php-fpm.log
+log_level = debug
+include=/usr/local/etc/php-fpm.d/*.conf
+
 [www]
 user = www-data
 group = www-data
-
 listen = 127.0.0.1:9000
-
 pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-
-chdir = /
+pm.max_children = 10
+pm.start_servers = 3
+pm.min_spare_servers = 2
+pm.max_spare_servers = 5
diff --git a/config/supervisord.conf b/config/supervisord.conf
index 38bdcb6..5faac0c 100644
--- a/config/supervisord.conf
+++ b/config/supervisord.conf
@@ -4,11 +4,13 @@ logfile=/var/log/supervisor/supervisord.log
 loglevel=info
 
 [program:php-fpm]
-command=/usr/local/sbin/php-fpm
+command=/usr/local/sbin/php-fpm --fpm-config /usr/local/etc/php-fpm.conf
+directory=/usr/local
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/php-fpm.err.log
 stdout_logfile=/var/log/supervisor/php-fpm.out.log
+user=www-data
 
 [program:nginx]
 command=/usr/sbin/nginx -c /etc/nginx/nginx.conf -g 'daemon off;'