From 73c73bfd155de0cee3f945777519b057d2e41bbc Mon Sep 17 00:00:00 2001
From: Spyderfoo <36179436+neokyx@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:28:21 +0100
Subject: [PATCH 1/5] Update Dockerfile Php

The PHP OPcache module is not properly configured. The OPcache buffer is nearly full. To assure that all scripts can be hold in cache, it is recommended to apply "opcache.memory_consumption" to your PHP configuration with a value higher than "128"

Signed-off-by: Spyderfoo <36179436+neokyx@users.noreply.github.com>
---
 30/apache/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 73ac6ccc..1ff4134c 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -98,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=256'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
         echo 'opcache.jit=1255'; \

From 04c7e74becb46a8941c37f5bc381c117d05edd8d Mon Sep 17 00:00:00 2001
From: Spyderfoo <36179436+neokyx@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:34:30 +0100
Subject: [PATCH 2/5] Update Dockerfile

Suggesting (#line 101) to improve opcache.memory_consumption to value 256 instead of 128, in order to avoid the following recurrent warning, even when a rather light Nextcloud installation, with very few (4/5) apps is used.
```
"The PHP OPcache module is not properly configured. The OPcache buffer is nearly full. To assure that all scripts can be hold in cache, it is recommended to apply "opcache.memory_consumption" to your PHP configuration with a value higher than "128".
```

Signed-off-by: Spyderfoo <36179436+neokyx@users.noreply.github.com>
---
 30/fpm-alpine/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 52ea716c..0d7f37d1 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -93,7 +93,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=256'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
         echo 'opcache.jit=1255'; \

From 889427d743f4d0b85c9d3de87cad734665bba830 Mon Sep 17 00:00:00 2001
From: Spyderfoo <36179436+neokyx@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:37:49 +0100
Subject: [PATCH 3/5] Update Dockerfile

Signed-off-by: Spyderfoo <36179436+neokyx@users.noreply.github.com>
---
 30/fpm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index dfe49612..10de8dad 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -98,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=256'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
         echo 'opcache.jit=1255'; \

From 13e24519a258596f888ce3ca236f872a85413042 Mon Sep 17 00:00:00 2001
From: neokyx <36179436+neokyx@users.noreply.github.com>
Date: Mon, 30 Dec 2024 10:48:58 +0100
Subject: [PATCH 4/5] Update Dockerfile-debian.template

opcache mem consump 128 > 512

Signed-off-by: neokyx <36179436+neokyx@users.noreply.github.com>
---
 Dockerfile-debian.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8b66dd34..9a7336bc 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -97,7 +97,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=512'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
         echo 'opcache.jit=1255'; \

From 351e81f6d2136bf27dbe7c70dea00b4bb1839629 Mon Sep 17 00:00:00 2001
From: neokyx <36179436+neokyx@users.noreply.github.com>
Date: Mon, 30 Dec 2024 12:02:55 +0100
Subject: [PATCH 5/5] Update Dockerfile

+ apt upgrade

Signed-off-by: neokyx <36179436+neokyx@users.noreply.github.com>
---
 30/apache/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 1ff4134c..6f57c148 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -89,7 +89,7 @@ RUN set -ex; \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    apt-get upgrade -y && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
     rm -rf /var/lib/apt/lists/*
 
 # set recommended PHP.ini settings
@@ -164,7 +164,7 @@ RUN set -ex; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
     \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    apt-get upgrade -y && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
 
 COPY *.sh upgrade.exclude /