Merge e1ffc53e13 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-13 00:48:20 +01:00 · 2025-01-11 18:22:33 +00:00 · 2025-01-11 18:22:09 +00:00 · 2024-04-03 17:53:59 +00:00 · 2024-04-03 17:53:59 +00:00
13 changed files with 43 additions and 2 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/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/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/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-alpine.template
+++ b/Dockerfile-alpine.template
@ -96,7 +96,7 @@ RUN { \
        echo 'opcache.save_comments=1'; \
        echo 'opcache.revalidate_freq=60'; \
        echo 'opcache.jit=1255'; \
-        echo 'opcache.jit_buffer_size=128M'; \
+        echo 'opcache.jit_buffer_size=8M'; \
    } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
    \
    echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -101,7 +101,7 @@ RUN { \
        echo 'opcache.save_comments=1'; \
        echo 'opcache.revalidate_freq=60'; \
        echo 'opcache.jit=1255'; \
-        echo 'opcache.jit_buffer_size=128M'; \
+        echo 'opcache.jit_buffer_size=8M'; \
    } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
    \
    echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
--- 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
adripo	1e1483387b	Merge `e1ffc53e13` into `7f707b6c5d`	2025-01-13 00:48:20 +01: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
adripo	e1ffc53e13	fix: revert opcache memory consumption and strings buffer Signed-off-by: adripo <26493496+adripo@users.noreply.github.com>	2024-04-03 17:53:59 +00:00
adripo	2d30be59ed	fix: opcache configuration Signed-off-by: adripo <26493496+adripo@users.noreply.github.com>	2024-04-03 17:53:59 +00:00