From 630097a4e03e84ecbfeba6030ff48b8bed20595a Mon Sep 17 00:00:00 2001
From: wanghe <wanghe@fit2cloud.com>
Date: Thu, 30 May 2024 17:39:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E8=A3=85=20Redis=20=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E5=AF=86=E7=A0=81=E4=B8=BA=E7=A9=BA=20(#1500)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/redis/6.2.14/data.yml           | 4 ++--
 apps/redis/6.2.14/docker-compose.yml | 8 +++++++-
 apps/redis/7.2.5/data.yml            | 4 ++--
 apps/redis/7.2.5/docker-compose.yml  | 8 +++++++-
 apps/redis/data.yml                  | 2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/apps/redis/6.2.14/data.yml b/apps/redis/6.2.14/data.yml
index fccff6aa..56321ccc 100755
--- a/apps/redis/6.2.14/data.yml
+++ b/apps/redis/6.2.14/data.yml
@@ -1,11 +1,11 @@
 additionalProperties:
     formFields:
-        - default: jhkdjhkjdhsIUTYURT
+        - default: redis
           envKey: PANEL_REDIS_ROOT_PASSWORD
           labelEn: Password
           labelZh: 密码
           random: true
-          required: true
+          required: false
           rule: paramComplexity
           type: password
         - default: 6379
diff --git a/apps/redis/6.2.14/docker-compose.yml b/apps/redis/6.2.14/docker-compose.yml
index ab12ff6d..1834d234 100644
--- a/apps/redis/6.2.14/docker-compose.yml
+++ b/apps/redis/6.2.14/docker-compose.yml
@@ -7,7 +7,13 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:6379
-    command: redis-server  /etc/redis/redis.conf --loglevel warning --requirepass ${PANEL_REDIS_ROOT_PASSWORD}
+    command: >
+      sh -c '
+      if [ -z "${PANEL_REDIS_ROOT_PASSWORD}" ]; then
+        redis-server /etc/redis/redis.conf
+      else
+        redis-server /etc/redis/redis.conf --requirepass ${PANEL_REDIS_ROOT_PASSWORD}
+      fi'
     volumes:
       - ./data:/data
       - ./conf/redis.conf:/etc/redis/redis.conf
diff --git a/apps/redis/7.2.5/data.yml b/apps/redis/7.2.5/data.yml
index ecf36a9f..56321ccc 100755
--- a/apps/redis/7.2.5/data.yml
+++ b/apps/redis/7.2.5/data.yml
@@ -1,11 +1,11 @@
 additionalProperties:
     formFields:
-        - default: jhkdjhkjdhsIUTYURTU
+        - default: redis
           envKey: PANEL_REDIS_ROOT_PASSWORD
           labelEn: Password
           labelZh: 密码
           random: true
-          required: true
+          required: false
           rule: paramComplexity
           type: password
         - default: 6379
diff --git a/apps/redis/7.2.5/docker-compose.yml b/apps/redis/7.2.5/docker-compose.yml
index 2e7fe51a..ce4fdeeb 100644
--- a/apps/redis/7.2.5/docker-compose.yml
+++ b/apps/redis/7.2.5/docker-compose.yml
@@ -7,7 +7,13 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:6379
-    command: redis-server  /etc/redis/redis.conf --requirepass ${PANEL_REDIS_ROOT_PASSWORD}
+    command: >
+      sh -c '
+      if [ -z "${PANEL_REDIS_ROOT_PASSWORD}" ]; then
+        redis-server /etc/redis/redis.conf
+      else
+        redis-server /etc/redis/redis.conf --requirepass ${PANEL_REDIS_ROOT_PASSWORD}
+      fi'
     volumes:
       - ./data:/data
       - ./conf/redis.conf:/etc/redis/redis.conf
diff --git a/apps/redis/data.yml b/apps/redis/data.yml
index 57280f71..0ee91e41 100755
--- a/apps/redis/data.yml
+++ b/apps/redis/data.yml
@@ -12,7 +12,7 @@ additionalProperties:
     shortDescEn: High-performance open-source key-value database
     type: runtime
     crossVersionUpdate: true
-    limit: 1
+    limit: 0
     recommend: 4
     website: https://redis.io/
     github: https://github.com/redis/redis