From 4ea8d7312587bd300badaea6ad87834bcb38b2ef Mon Sep 17 00:00:00 2001
From: Gauthier DUPONT <gdupont@cadoles.com>
Date: Wed, 8 Oct 2025 15:03:52 +0200
Subject: [PATCH] feat(frankenphp): prepare caddyfile for prod image

---
 misc/files/Caddyfile                  | 16 ----------------
 misc/files/frankenphp.caddyfile-dev   | 22 ++++++++++++++++++++++
 misc/files/frankenphp.caddyfile-prod  | 19 +++++++++++++++++++
 misc/images/hydra-sql-prod/Dockerfile |  7 ++++---
 4 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 misc/files/frankenphp.caddyfile-dev

diff --git a/misc/files/Caddyfile b/misc/files/Caddyfile
index 8c9a8c4..246c64c 100644
--- a/misc/files/Caddyfile
+++ b/misc/files/Caddyfile
@@ -13,24 +13,8 @@
 
         frankenphp {
                 php_ini {
-                        realpath_cache_size 4096K
-                        realpath_cache_ttl 600
-                        opcache.enable_cli 1
-			opcache.memory_consumption 512
-			opcache.max_accelerated_files 20000
-                        opcache.preload /app/config/preload.php
-                        opcache.preload_user www-data
-                        apc.enable_cli 1
-                        apc.enable 1
-
                         {$PHPINI_EXTRA_CONFIG}
                 }
-                worker {
-                        file /app/public/index.php
-                        watch
-                        name hydra-sql-worker
-                        {$FRANKENPHP_WORKER_CONFIG}
-                }
                 {$FRANKENPHP_CONFIG}
         }
 }
diff --git a/misc/files/frankenphp.caddyfile-dev b/misc/files/frankenphp.caddyfile-dev
new file mode 100644
index 0000000..d92766f
--- /dev/null
+++ b/misc/files/frankenphp.caddyfile-dev
@@ -0,0 +1,22 @@
+{
+	frankenphp {
+		php_ini {
+			realpath_cache_size 4096K
+			realpath_cache_ttl 600
+			opcache.enable_cli 1
+			opcache.memory_consumption 512
+			opcache.max_accelerated_files 20000
+			opcache.preload /app/config/preload.php
+			opcache.preload_user www-data
+			opcache.validate_timestamps 0
+			opcache.revalidate_freq 0
+			apc.enable_cli 1
+			apc.enable 1
+		}
+		worker {
+			file /app/public/index.php
+			name hydra-sql-worker
+			watch
+		}
+	}
+}
\ No newline at end of file
diff --git a/misc/files/frankenphp.caddyfile-prod b/misc/files/frankenphp.caddyfile-prod
index 1ef2a15..74dc55d 100644
--- a/misc/files/frankenphp.caddyfile-prod
+++ b/misc/files/frankenphp.caddyfile-prod
@@ -1,8 +1,27 @@
 {
 	frankenphp {
 		php_ini {
+			realpath_cache_size 4096K
+			realpath_cache_ttl 600
+			opcache.enable_cli 1
+			opcache.memory_consumption 512
+			opcache.max_accelerated_files 20000
+			opcache.preload /app/config/preload.php
+			opcache.preload_user www-data
 			opcache.validate_timestamps 0
 			opcache.revalidate_freq 0
+			apc.enable_cli 1
+			apc.enable 1
+			zend.exception_ignore_args On
+			zend.exception_string_param_max_len 0
+			error_reporting E_ALL & ~E_DEPRECATED
+			display_errors Off
+			display_startup_errors Off
+			zend.assertions -1
+		}
+		worker {
+			file /app/public/index.php
+			name hydra-sql-worker
 		}
 	}
 }
\ No newline at end of file
diff --git a/misc/images/hydra-sql-prod/Dockerfile b/misc/images/hydra-sql-prod/Dockerfile
index e7333f2..81ea899 100644
--- a/misc/images/hydra-sql-prod/Dockerfile
+++ b/misc/images/hydra-sql-prod/Dockerfile
@@ -18,7 +18,7 @@ ARG APP_ENV=prod \
     APP_LOCALES="fr,en" \
     BASE_PATH=""
 
-COPY ./misc/files/Caddyfile /etc/frankenphp/Caddyfile
+COPY ./misc/files/Caddyfile /etc/caddy/Caddyfile
 
 WORKDIR /app
 
@@ -47,8 +47,8 @@ ENV APP_ENV=prod \
     BASE_PATH="" \
     VERSION=${VERSION}
 
-COPY ./misc/files/Caddyfile /etc/frankenphp/Caddyfile
-COPY ./misc/files/frankenphp.caddyfile-prod /etc/frankenphp/Caddyfile.d/frankenphp.caddyfile
+COPY ./misc/files/Caddyfile /etc/caddy/Caddyfile
+COPY ./misc/files/frankenphp.caddyfile-prod /etc/caddy/Caddyfile.d/frankenphp.caddyfile
 
 WORKDIR /app
 
@@ -60,4 +60,5 @@ RUN cp $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini \
         pdo_mysql \
         opcache \
         apcu \
+        intl \
         redis
\ No newline at end of file