Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

request_terminate_timeout=3600 to php fpm #299

Merged
merged 1 commit into from
Sep 27, 2023
Merged

request_terminate_timeout=3600 to php fpm #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.develop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
5 changes: 5 additions & 0 deletions docker/conf/php/php-fpm-custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading