Glebaster/forum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to load app's ini files after all other extensions are loaded ()

Browse Source 
Co-authored-by: Borislav Kosun <kosun.b@yandex.com>
Co-authored-by: Leroy Baeyens <leroybaeyens@leroys-mbp.home>
This commit is contained in:
Leroy Baeyens 2024-08-07 14:37:07 +02:00 committed by GitHub
parent 37f5942c72
commit 8ba41cf495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 3 deletions

8
Dockerfile

@ -36,10 +36,12 @@ RUN set -eux; \
# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_ALLOW_SUPERUSER=1
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
###> recipes ### ###> recipes ###
###< 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 --chmod=755 frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
@ -60,7 +62,7 @@ RUN set -eux; \
xdebug \ 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" ] 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" 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 COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
# prevent the reinstallation of vendors at every changes in the source code # prevent the reinstallation of vendors at every changes in the source code

0
frankenphp/conf.d/app.ini → frankenphp/conf.d/10-app.ini

0
frankenphp/conf.d/app.dev.ini → frankenphp/conf.d/20-app.dev.ini

0
frankenphp/conf.d/app.prod.ini → frankenphp/conf.d/20-app.prod.ini