8000 Fix to load app's ini files after all other extensions are loaded (#617) · dunglas/symfony-docker@8ba41cf · GitHub
[go: up one dir, main page]

Skip to content

Commit 8ba41cf

Browse files
leroy0211bkosunLeroy Baeyens
authored
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>
1 parent 37f5942 commit 8ba41cf

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ RUN set -eux; \
3636
# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
3737
ENV COMPOSER_ALLOW_SUPERUSER=1
3838

39+
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
40+
3941
###> recipes ###
4042
###< recipes ###
4143

42-
COPY --link frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/
44+
COPY --link frankenphp/conf.d/10-app.ini $PHP_INI_DIR/app.conf.d/
4345
COPY --link --chmod=755 frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
4446
COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
4547

@@ -60,7 +62,7 @@ RUN set -eux; \
6062
xdebug \
6163
;
6264

63-
COPY --link frankenphp/conf.d/app.dev.ini $PHP_INI_DIR/conf.d/
65+
COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
6466

6567
CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
6668

@@ -72,7 +74,7 @@ ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
7274

7375
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
7476

75-
COPY --link frankenphp/conf.d/app.prod.ini $PHP_INI_DIR/conf.d/
77+
COPY --link frankenphp/conf.d/20-app.prod.ini $PHP_INI_DIR/app.conf.d/
7678
COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
7779

7880
# prevent the reinstallation of vendors at every changes in the source code
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
0