From 8ba41cf495af1e723d99b41d979ec42d187a25e1 Mon Sep 17 00:00:00 2001
From: Leroy Baeyens <leroybaeyens@zeelandnet.nl>
Date: Wed, 7 Aug 2024 14:37:07 +0200
Subject: [PATCH] Fix to load app's ini files after all other extensions are
 loaded (#617)

Co-authored-by: Borislav Kosun <kosun.b@yandex.com>
Co-authored-by: Leroy Baeyens <leroybaeyens@leroys-mbp.home>
---
 Dockerfile                                          | 8 +++++---
 frankenphp/conf.d/{app.ini => 10-app.ini}           | 0
 frankenphp/conf.d/{app.dev.ini => 20-app.dev.ini}   | 0
 frankenphp/conf.d/{app.prod.ini => 20-app.prod.ini} | 0
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename frankenphp/conf.d/{app.ini => 10-app.ini} (100%)
 rename frankenphp/conf.d/{app.dev.ini => 20-app.dev.ini} (100%)
 rename frankenphp/conf.d/{app.prod.ini => 20-app.prod.ini} (100%)

diff --git a/Dockerfile b/Dockerfile
index 986824f..30e1ce8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,10 +36,12 @@ RUN set -eux; \
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
+ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
+
 ###> recipes ###
 ###< recipes ###
 
-COPY --link frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/
+COPY --link frankenphp/conf.d/10-app.ini $PHP_INI_DIR/app.conf.d/
 COPY --link --chmod=755 frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
 
@@ -60,7 +62,7 @@ RUN set -eux; \
 		xdebug \
 	;
 
-COPY --link frankenphp/conf.d/app.dev.ini $PHP_INI_DIR/conf.d/
+COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
 
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
 
@@ -72,7 +74,7 @@ ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-COPY --link frankenphp/conf.d/app.prod.ini $PHP_INI_DIR/conf.d/
+COPY --link frankenphp/conf.d/20-app.prod.ini $PHP_INI_DIR/app.conf.d/
 COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
 
 # prevent the reinstallation of vendors at every changes in the source code
diff --git a/frankenphp/conf.d/app.ini b/frankenphp/conf.d/10-app.ini
similarity index 100%
rename from frankenphp/conf.d/app.ini
rename to frankenphp/conf.d/10-app.ini
diff --git a/frankenphp/conf.d/app.dev.ini b/frankenphp/conf.d/20-app.dev.ini
similarity index 100%
rename from frankenphp/conf.d/app.dev.ini
rename to frankenphp/conf.d/20-app.dev.ini
diff --git a/frankenphp/conf.d/app.prod.ini b/frankenphp/conf.d/20-app.prod.ini
similarity index 100%
rename from frankenphp/conf.d/app.prod.ini
rename to frankenphp/conf.d/20-app.prod.ini