Merge b4bc66dedb into 08ac24880c

Alpine 3.21 (#2360 )
Use PHP_OPCACHE_MEMORY_CONSUMTION in Dockerfile-alpine.template
2025-07-22 07:08:06 +02:00 · 2025-01-10 06:29:05 +01:00 · 2025-01-09 23:01:21 +00:00 · 2023-10-26 11:19:39 +02:00 · 2023-10-26 11:19:39 +02:00
7 changed files with 11 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/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -88,11 +88,12 @@ RUN set -ex; \
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
 ENV PHP_MEMORY_LIMIT 512M
 ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMTION 128
 RUN { \
        echo 'opcache.enable=1'; \
        echo 'opcache.interned_strings_buffer=32'; \
        echo 'opcache.max_accelerated_files=10000'; \
-        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMTION}'; \
        echo 'opcache.save_comments=1'; \
        echo 'opcache.revalidate_freq=60'; \
        echo 'opcache.jit=1255'; \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -20,6 +20,7 @@ RUN set -ex; \
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
 ENV PHP_MEMORY_LIMIT 512M
 ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMTION 128
 RUN set -ex; \
    \
    savedAptMark="$(apt-mark showmanual)"; \
@ -97,7 +98,7 @@ RUN { \
        echo 'opcache.enable=1'; \
        echo 'opcache.interned_strings_buffer=32'; \
        echo 'opcache.max_accelerated_files=10000'; \
-        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMTION}'; \
        echo 'opcache.save_comments=1'; \
        echo 'opcache.revalidate_freq=60'; \
        echo 'opcache.jit=1255'; \
--- 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=(
--- 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	136da21cc9	Merge `b4bc66dedb` into `08ac24880c`	2025-01-10 06:29:05 +01:00
J0WI	08ac24880c	Alpine 3.21 (#2360 )	2025-01-09 23:01:21 +00:00
Thomas Clavier	b4bc66dedb	Use PHP_OPCACHE_MEMORY_CONSUMTION in Dockerfile-alpine.template Signed-off-by: Thomas Clavier <tom@tcweb.org>	2023-10-26 11:19:39 +02:00
Thomas Clavier	a53f275440	use var PHP_OPCACHE_MEMORY_CONSUMTION for configuration Signed-off-by: Thomas Clavier <tom@tcweb.org>	2023-10-26 11:19:39 +02:00