From 9dbeda11dbb7e4c6d52c0f62e92106596ffdc2df Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 2 Dec 2020 12:40:15 +0100
Subject: [PATCH] feat: Add password on REDIS to fix migration to 20.0.1

See discussion on https://help.nextcloud.com/t/solved-latest-docker-image-broke-the-installation-redis-password-auth/87598/15
---
 nextcloud/.env               | 4 ++++
 nextcloud/docker-compose.yml | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nextcloud/.env b/nextcloud/.env
index 59620b8..6b5988d 100644
--- a/nextcloud/.env
+++ b/nextcloud/.env
@@ -23,3 +23,7 @@ POSTGRES_PASSWORD=password-example
 POSTGRES_DB=postgres-database-name-example
 POSTGRES_CONTAINER_NAME=nextcloud-postgres
 POSTGRES_VOLUME_NAME=nextcloud-postgres
+
+# REDIS
+
+NEXTCLOUD_REDIS_PASSWORD=redis-password
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 9ea16da..cffb9ce 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -37,6 +37,7 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: ${POSTGRES_USER}
       REDIS_HOST: 'nextcloud-redis'
+      REDIS_HOST_PASSWORD: ${NEXTCLOUD_REDIS_PASSWORD}
       PUID: 1001
       PGID: 119
     labels:
@@ -61,9 +62,10 @@ services:
       - /etc/localtime:/etc/localtime:ro
 
   nextcloud-redis:
-    image: redis:6.0.8-alpine
+    image: redis:6.0.9-alpine
     container_name: nextcloud-redis
     restart: always
+    command: redis-server --requirepass ${NEXTCLOUD_REDIS_PASSWORD}
     environment:
       PUID: 1001
       PGID: 119