Merge 2d5a52a9a5 into 08ac24880c

fix typo : CONSUMTION -> CONSUMPTION
Merge remote-tracking branch 'upstream/master' into patch-3
2025-07-22 15:18:05 +02:00 · 2025-01-10 10:22:48 +00:00 · 2025-01-10 11:22:35 +01:00 · 2025-01-10 11:19:18 +01:00 · 2023-10-26 11:19:39 +02:00 · 2023-10-26 11:19:39 +02:00
2 changed files with 4 additions and 2 deletions
--- 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_CONSUMPTION 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_CONSUMPTION}'; \
        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_CONSUMPTION 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_CONSUMPTION}'; \
        echo 'opcache.save_comments=1'; \
        echo 'opcache.revalidate_freq=60'; \
        echo 'opcache.jit=1255'; \
Author	SHA1	Message	Date
Thomas Clavier	119f045dd8	Merge `2d5a52a9a5` into `08ac24880c`	2025-01-10 10:22:48 +00:00
Thomas Clavier	2d5a52a9a5	fix typo : CONSUMTION -> CONSUMPTION	2025-01-10 11:22:35 +01:00
Thomas Clavier	8bb3779baa	Merge remote-tracking branch 'upstream/master' into patch-3	2025-01-10 11:19:18 +01: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