Merge 351e81f6d2 into 7f707b6c5d

Runs update.sh
Add REDIS_HOST_USER variable to specify a redis user (#2359 )
2025-07-21 22:58:05 +02:00 · 2025-01-11 18:22:36 +00:00 · 2025-01-11 18:22:33 +00:00 · 2025-01-11 18:22:09 +00:00 · 2024-12-30 12:02:55 +01:00 · 2024-12-30 10:48:58 +01:00
15 changed files with 47 additions and 6 deletions
--- a/.config/redis.config.php
+++ b/.config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- a/28/apache/config/redis.config.php
+++ b/28/apache/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- a/28/fpm-alpine/config/redis.config.php
+++ b/28/fpm-alpine/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- a/28/fpm/config/redis.config.php
+++ b/28/fpm/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- a/29/apache/config/redis.config.php
+++ b/29/apache/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- a/29/fpm-alpine/config/redis.config.php
+++ b/29/fpm-alpine/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- a/29/fpm/config/redis.config.php
+++ b/29/fpm/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- 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
@ -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'; \
@ -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 /
--- a/30/apache/config/redis.config.php
+++ b/30/apache/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- 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'; \
--- a/30/fpm-alpine/config/redis.config.php
+++ b/30/fpm-alpine/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- 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'; \
--- a/30/fpm/config/redis.config.php
+++ b/30/fpm/config/redis.config.php
@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
  } elseif (getenv('REDIS_HOST')[0] != '/') {
    $CONFIG['redis']['port'] = 6379;
  }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
--- 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'; \
--- a/README.md
+++ b/README.md
@ -236,6 +236,7 @@ To use Redis for memory caching as well as PHP session storage, specify the foll

 - `REDIS_HOST` (not set by default) Name of Redis container
 - `REDIS_HOST_PORT` (default: `6379`) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_USER` (not set by default) Optional username for Redis, only use for external Redis servers that require a user.
 - `REDIS_HOST_PASSWORD` (not set by default) Redis password

 Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html) for more information.
Author	SHA1	Message	Date
neokyx	6a954b47e4	Merge `351e81f6d2` into `7f707b6c5d`	2025-01-11 18:22:36 +00:00
GitHub Workflow	7f707b6c5d	Runs update.sh	2025-01-11 18:22:33 +00:00
Hagen	5b932e390e	Add REDIS_HOST_USER variable to specify a redis user (#2359 ) Signed-off-by: hagene <hagene@uio.no>	2025-01-11 18:22:09 +00:00
neokyx	351e81f6d2	Update Dockerfile + apt upgrade Signed-off-by: neokyx <36179436+neokyx@users.noreply.github.com>	2024-12-30 12:02:55 +01:00
neokyx	13e24519a2	Update Dockerfile-debian.template opcache mem consump 128 > 512 Signed-off-by: neokyx <36179436+neokyx@users.noreply.github.com>	2024-12-30 10:48:58 +01:00
Spyderfoo	008440f9e8	Merge branch 'nextcloud:master' into master	2024-12-27 01:55:54 +01:00
Spyderfoo	889427d743	Update Dockerfile Signed-off-by: Spyderfoo <36179436+neokyx@users.noreply.github.com>	2024-12-17 09:37:49 +01:00
Spyderfoo	04c7e74bec	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>	2024-12-17 09:34:30 +01:00
Spyderfoo	73c73bfd15	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>	2024-12-17 09:28:21 +01:00