wait #5780 @1

diff --git a/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/Dockerfile b/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/Dockerfile
index cb0d6c3cd1ea861ac1aefa87c9a7bef86de0b835..0ee19fc63458e4add16f03ea12fd53cc723e8da8 100644 (file)
--- a/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/Dockerfile
+++ b/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/Dockerfile
@@ -48,7 +48,7 @@ RUN apt-get update \
         php$phpversion-curl \
         php$phpversion-json \
         php$phpversion-mcrypt \
-        less nano wget curl; \
+        less nano wget curl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* ~/.composer
 

diff --git a/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/overrides.conf b/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/overrides.conf
new file mode 100644 (file)
index 0000000..4a99e3e
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/template/phpdocker/php-fpm/overrides.conf
@@ -0,0 +1,37 @@
+[global]
+; Override default pid file
+pid = /run/php-fpm.pid
+
+; Avoid logs being sent to syslog
+error_log = /proc/self/fd/2
+
+; Set this to php default's max_execution_time to allow children to stop gracefully when fpm is commanded to stop
+; This helps avoiding 502's
+process_control_timeout = 30
+
+; Do not daemonize (eg send process to the background)
+daemonize = no
+
+[www]
+; Access from webserver container is via network, not socket file
+listen = [::]:9000
+
+; Redirect logs to stdout - FPM closes /dev/std* on startup
+access.log = /proc/self/fd/1
+catch_workers_output = yes
+
+; Remove "pool www" decoration from log output (older phpdocker.io containers for php use sed for this)
+decorate_workers_output = no
+
+; Required to allow config-by-environment
+clear_env = no
+
+user = 1001
+group = 33
+
+pm = dynamic
+pm.max_children = 160
+pm.start_servers = 48
+pm.min_spare_servers = 40
+pm.max_spare_servers = 80
+pm.max_requests = 1000

diff --git a/resources/tools/dockerwebcontainer/template/update b/resources/tools/dockerwebcontainer/template/update
index 8f229a9062fd9aa170e0f4854afbb5aaeff81b20..96c0a88fc20dde1f07014f9bb3a5457c15722336 100644 (file)
--- a/resources/tools/dockerwebcontainer/template/update
+++ b/resources/tools/dockerwebcontainer/template/update
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd /docker/$name
 docker network create $name
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose pull
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose build
-docker-compose down
-docker-compose up -d
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
+docker compose down
+docker compose up -d