diff --git a/Dockerfile b/Dockerfile index b1030e3c..deb655bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,8 @@ RUN cp docker/envs/.env.postgres.prod /var/www/html/.env \ && cp docker/conf/supervisor/scheduler.conf /etc/supervisor/custom.d/scheduler.conf \ && cp docker/conf/supervisor/horizon.conf /etc/supervisor/custom.d/horizon.conf \ && cp docker/conf/caddy/Caddyfile /etc/caddy/Caddyfile \ - && cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini + && cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini \ + && cp docker/conf/php/php-fpm-custom.ini /usr/local/etc/php-fpm.conf/php-fpm-custom.ini RUN composer self-update && composer install --no-scripts RUN chown -R devilbox:devilbox /var/www/ diff --git a/Dockerfile.develop b/Dockerfile.develop index bc37ac80..8246bbdd 100644 --- a/Dockerfile.develop +++ b/Dockerfile.develop @@ -13,7 +13,8 @@ RUN cp docker/envs/.env.postgres.develop /var/www/html/.env \ && cp docker/conf/supervisor/scheduler.conf /etc/supervisor/custom.d/scheduler.conf \ && cp docker/conf/supervisor/horizon.conf /etc/supervisor/custom.d/horizon.conf \ && cp docker/conf/caddy/Caddyfile /etc/caddy/Caddyfile \ - && cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini + && cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini \ + && cp docker/conf/php/php-fpm-custom.ini /usr/local/etc/php-fpm.conf/php-fpm-custom.ini RUN composer self-update && composer install --no-scripts RUN chown -R devilbox:devilbox /var/www/ diff --git a/docker/conf/php/php-fpm-custom.ini b/docker/conf/php/php-fpm-custom.ini new file mode 100644 index 00000000..b626c900 --- /dev/null +++ b/docker/conf/php/php-fpm-custom.ini @@ -0,0 +1,5 @@ +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 3600s \ No newline at end of file