Merge 9360474bc1 into 9ff7b6a529

Changing naming convetion to match others

Signed-off-by: Jan Zalar <jan.zalar6@gmail.com>

28/apache/Dockerfile

@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

28/fpm-alpine/Dockerfile

@@ -66,7 +66,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

28/fpm/Dockerfile

@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

29/apache/Dockerfile

@@ -21,6 +21,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 REDIS_DB_INDEX=0
 RUN set -ex; \
     \
     savedAptMark="$(apt-mark showmanual)"; \
@@ -68,7 +69,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

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_DB_INDEX') !== false) {
+    $CONFIG['redis']['dbindex'] = (int) getenv('REDIS_DB_INDEX');
+  }
+
 }

29/fpm-alpine/Dockerfile

@@ -66,7 +66,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

29/fpm/Dockerfile

@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

30/apache/Dockerfile

@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

30/fpm-alpine/Dockerfile

@@ -66,7 +66,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

30/fpm/Dockerfile

@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \

README.md

@@ -160,6 +160,7 @@ If you want to use Redis you have to create a separate [Redis](https://hub.docke
 - `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_PASSWORD` (not set by default) Redis password
+- `REDIS_DB_INDEX` (default: `0`) Value for dbindex config value
 
 The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
 

docker-entrypoint.sh

@@ -114,15 +114,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
             # check if redis host is an unix socket path
             if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
               if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
-                echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                echo "session.save_path = \"unix://${REDIS_HOST}/${REDIS_DB_INDEX}?auth=${REDIS_HOST_PASSWORD}\""
               else
-                echo "session.save_path = \"unix://${REDIS_HOST}\""
+                echo "session.save_path = \"unix://${REDIS_HOST}/${REDIS_DB_INDEX}\""
               fi
             # check if redis password has been set
             elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
-                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}/${REDIS_DB_INDEX}?auth=${REDIS_HOST_PASSWORD}\""
             else
-                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}/${REDIS_DB_INDEX}\""
             fi
             echo "redis.session.locking_enabled = 1"
             echo "redis.session.lock_retries = -1"