Merge f5f23fcebf into 3adaf30839

Runs update.sh
use PHP_FPM_DIR and PHP_PM_MAX_CHILDREN vars
2025-04-20 18:56:09 +02:00 · 2025-03-27 12:44:31 +02:00 · 2025-03-25 00:35:32 +00:00 · 2023-10-26 13:36:20 +02:00 · 2023-10-26 13:36:20 +02:00 · 2023-10-26 13:36:20 +02:00
10 changed files with 11 additions and 11 deletions
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -84,7 +84,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -84,7 +84,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@ -84,7 +84,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/update.sh
+++ b/update.sh
@ -28,8 +28,8 @@ declare -A base=(
 declare -A extras=(
 	[apache]='\nRUN a2enmod headers rewrite remoteip ; \\\n    { \\\n     echo '\''RemoteIPHeader X-Real-IP'\''; \\\n     echo '\''RemoteIPInternalProxy 10.0.0.0/8'\''; \\\n     echo '\''RemoteIPInternalProxy 172.16.0.0/12'\''; \\\n     echo '\''RemoteIPInternalProxy 192.168.0.0/16'\''; \\\n    } > /etc/apache2/conf-available/remoteip.conf; \\\n    a2enconf remoteip\n\n# set apache config LimitRequestBody\nENV APACHE_BODY_LIMIT 1073741824\nRUN { \\\n     echo '\''LimitRequestBody ${APACHE_BODY_LIMIT}'\''; \\\n    } > /etc/apache2/conf-available/apache-limits.conf; \\\n    a2enconf apache-limits'
-	[fpm]=''
+	[fpm]='\nENV PHP_PM_MAX_CHILDREN 16\nRUN {\\\n     echo'\''pm = pm=dynamic'\''; \\\n     echo'\''pm.start_servers = 4'\''; \\\n     echo'\''pm.min_spare_servers = 2'\''; \\\n     echo'\''pm.max_spare_servers = 24'\''; \\\n     echo'\''pm.max_children = ${PHP_PM_MAX_CHILDREN}'\''; \\\n    } > "${PHP_FPM_DIR}/nextcloud.conf";\n'
-	[fpm-alpine]=''
+	[fpm-alpine]='\nENV PHP_PM_MAX_CHILDREN 16\nRUN {\\\n     echo'\''pm = pm=dynamic'\''; \\\n     echo'\''pm.start_servers = 4'\''; \\\n     echo'\''pm.min_spare_servers = 2'\''; \\\n     echo'\''pm.max_spare_servers = 24'\''; \\\n     echo'\''pm.max_children = ${PHP_PM_MAX_CHILDREN}'\''; \\\n    } > "${PHP_FPM_DIR}/nextcloud.conf";\n'
 )
 declare -A crontab_int=(
Author	SHA1	Message	Date
Thomas Clavier	1a3106288c	Merge `f5f23fcebf` into `3adaf30839`	2025-03-27 12:44:31 +02:00
GitHub Workflow	3adaf30839	Runs update.sh	2025-03-25 00:35:32 +00:00
Thomas Clavier	f5f23fcebf	use PHP_FPM_DIR and PHP_PM_MAX_CHILDREN vars Signed-off-by: Thomas Clavier <tom@tcweb.org>	2023-10-26 13:36:20 +02:00
Thomas Clavier	6a301fb1d6	Revert "Configure pm.max_children from env var" This reverts commit 4ce703efa64958f8e719575af899ba57c32f104b. Signed-off-by: Thomas Clavier <tom@tcweb.org>	2023-10-26 13:36:20 +02:00
Thomas Clavier	1bf2e95f05	Configure pm.max_children from env var Signed-off-by: Thomas Clavier <tom@tcweb.org>	2023-10-26 13:36:20 +02:00