Merge f5f23fcebf into 08ac24880c

Alpine 3.21 (#2360 )
use PHP_FPM_DIR and PHP_PM_MAX_CHILDREN vars
2025-07-22 07:08:06 +02:00 · 2025-01-10 09:55:27 +02:00 · 2025-01-09 23:01:21 +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
5 changed files with 9 additions and 9 deletions
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/update.sh
+++ b/update.sh
@ -2,7 +2,7 @@
 set -eo pipefail

 declare -A alpine_version=(
-	[default]='3.20'
+	[default]='3.21'
 )

 declare -A debian_version=(
@ -27,8 +27,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-alpine]=''
+	[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]='\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=(
--- a/versions.json
+++ b/versions.json
@ -20,7 +20,7 @@
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
-        "baseVersion": "3.20",
+        "baseVersion": "3.21",
        "phpVersion": "8.2"
      }
    }
@ -46,7 +46,7 @@
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
-        "baseVersion": "3.20",
+        "baseVersion": "3.21",
        "phpVersion": "8.2"
      }
    }
@ -72,7 +72,7 @@
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
-        "baseVersion": "3.20",
+        "baseVersion": "3.21",
        "phpVersion": "8.2"
      }
    }
Author	SHA1	Message	Date
Thomas Clavier	2f1c83a8af	Merge `f5f23fcebf` into `08ac24880c`	2025-01-10 09:55:27 +02:00
J0WI	08ac24880c	Alpine 3.21 (#2360 )	2025-01-09 23:01:21 +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