Merge branch 'next'

* next:
  increase some values in nginx and php-fpm configs

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Container image version
 # Note: the version here is from Dockerfile:ELABIMG_VERSION not the tagged one
 
+# 2.3.1
+* Fix configuration option PHP_MAX_CHILDREN not taken into account
+* Increase number of server threads for php-fpm
+* Increase fastcgi_read_timeout in nginx config
+
 # 2.3.0
 * Use s6-overlay instead of supervisor to launch services
 

Dockerfile

@@ -5,7 +5,7 @@ FROM alpine:3.12
 ENV ELABFTW_VERSION 3.6.5
 
 # this is versioning for the container image
-ENV ELABIMG_VERSION 2.3.0
+ENV ELABIMG_VERSION 2.3.1
 
 ENV S6_OVERLAY_VERSION 2.1.0.2
 

src/nginx/common.conf

@@ -6,6 +6,8 @@ index index.php;
 # fix 502 error "upstream sent too big header"
 fastcgi_buffers 16 16k;
 fastcgi_buffer_size 32k;
+# fix 504 errors "timeout"
+fastcgi_read_timeout 600s;
 
 # custom error pages
 error_page 400 /error-pages/400.html;

src/run.sh

@@ -134,6 +134,10 @@ phpfpmConf() {
     sed -i -e "s/group = nobody/group = ${elabftw_group}/g" /etc/php7/php-fpm.d/www.conf
     # increase max number of simultaneous requests
     sed -i -e "s/pm.max_children = 5/pm.max_children = ${php_max_children}/g" /etc/php7/php-fpm.d/www.conf
+    # allow more idle server processes
+    sed -i -e "s/pm.start_servers = 2/pm.start_servers = 5/g" /etc/php7/php-fpm.d/www.conf
+    sed -i -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 4/g" /etc/php7/php-fpm.d/www.conf
+    sed -i -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 6/g" /etc/php7/php-fpm.d/www.conf
     # allow using more memory
     sed -i -e "s/;php_admin_value\[memory_limit\] = 32M/php_admin_value\[memory_limit\] = ${max_php_memory}/" /etc/php7/php-fpm.d/www.conf
     # add container version in env