From b42b333a72a4ad20ac6b9a9a01bfc42b727ffbb1 Mon Sep 17 00:00:00 2001
From: shisaru292 <87224749+shisaru292@users.noreply.github.com>
Date: Wed, 20 Nov 2024 20:10:51 +0800
Subject: [PATCH] fix: handle redis authentication for healthcheck command
 (#10907)

---
 docker/README.md                      | 2 +-
 docker/docker-compose.middleware.yaml | 4 +++-
 docker/docker-compose.yaml            | 2 ++
 docker/middleware.env.example         | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 7ce3f9bd75..c3cd1f9e3c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -36,7 +36,7 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
     - Navigate to the `docker` directory.
     - Ensure the `middleware.env` file is created by running `cp middleware.env.example middleware.env` (refer to the `middleware.env.example` file).
 2. **Running Middleware Services**:
-    - Execute `docker-compose -f docker-compose.middleware.yaml up -d` to start the middleware services.
+    - Execute `docker-compose -f docker-compose.middleware.yaml up --env-file middleware.env -d` to start the middleware services.
 
 ### Migration for Existing Users
 
diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
index 2eea273e72..11f5302197 100644
--- a/docker/docker-compose.middleware.yaml
+++ b/docker/docker-compose.middleware.yaml
@@ -29,11 +29,13 @@ services:
   redis:
     image: redis:6-alpine
     restart: always
+    environment:
+      REDISCLI_AUTH: ${REDIS_PASSWORD:-difyai123456}
     volumes:
       # Mount the redis data directory to the container.
       - ${REDIS_HOST_VOLUME:-./volumes/redis/data}:/data
     # Set the redis password when startup redis server.
-    command: redis-server --requirepass difyai123456
+    command: redis-server --requirepass ${REDIS_PASSWORD:-difyai123456}
     ports:
       - "${EXPOSE_REDIS_PORT:-6379}:6379"
     healthcheck:
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 06b04d90b6..b47573bfc8 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -366,6 +366,8 @@ services:
   redis:
     image: redis:6-alpine
     restart: always
+    environment:
+      REDISCLI_AUTH: ${REDIS_PASSWORD:-difyai123456}
     volumes:
       # Mount the redis data directory to the container.
       - ./volumes/redis/data:/data
diff --git a/docker/middleware.env.example b/docker/middleware.env.example
index 17ac819527..c4ce9f0114 100644
--- a/docker/middleware.env.example
+++ b/docker/middleware.env.example
@@ -42,11 +42,13 @@ POSTGRES_EFFECTIVE_CACHE_SIZE=4096MB
 
 # -----------------------------
 # Environment Variables for redis Service
-REDIS_HOST_VOLUME=./volumes/redis/data
 # -----------------------------
+REDIS_HOST_VOLUME=./volumes/redis/data
+REDIS_PASSWORD=difyai123456
 
 # ------------------------------
 # Environment Variables for sandbox Service
+# ------------------------------
 SANDBOX_API_KEY=dify-sandbox
 SANDBOX_GIN_MODE=release
 SANDBOX_WORKER_TIMEOUT=15
@@ -54,7 +56,6 @@ SANDBOX_ENABLE_NETWORK=true
 SANDBOX_HTTP_PROXY=http://ssrf_proxy:3128
 SANDBOX_HTTPS_PROXY=http://ssrf_proxy:3128
 SANDBOX_PORT=8194
-# ------------------------------
 
 # ------------------------------
 # Environment Variables for ssrf_proxy Service