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>
This commit is contained in:
parent
37f5942c72
commit
8ba41cf495
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user