From c6c12b04f143e22af818aaee5ddb5b72de05230c Mon Sep 17 00:00:00 2001
From: chenc <1458513@qq.com>
Date: Wed, 8 Nov 2023 14:19:14 +0800
Subject: [PATCH] add

---
 docker-compose.yaml.example |  4 ++--
 redis/docker-entrypoint.sh  | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 redis/docker-entrypoint.sh

diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example
index 10ce264..323ddbc 100644
--- a/docker-compose.yaml.example
+++ b/docker-compose.yaml.example
@@ -89,12 +89,12 @@ services:
     container_name: redis
     restart: always
     environment:
-      - requirepass=${REDIS_PASSWORD:-qq1458513}
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-qq1458513}
     volumes:
       - "./redis/redis.conf:/etc/redis/redis.conf"
       - "./redis/data:/data/db"
       - "./logs/redis:/data/logs"
-    command: [ "redis-server", "/etc/redis/redis.conf" ]
+    command: [ "redis-server", "/etc/redis/redis.conf", "--requirepass ${REDIS_PASSWORD:-qq1458513}" ]
     healthcheck:
       test: [ "CMD", "redis-cli", "ping" ]
       interval: 1s
diff --git a/redis/docker-entrypoint.sh b/redis/docker-entrypoint.sh
new file mode 100644
index 0000000..ce89f7a
--- /dev/null
+++ b/redis/docker-entrypoint.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+echo $REDIS_PASSWORD
+# first arg is `-f` or `--some-option`
+# or first arg is `something.conf`
+if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
+	set -- redis-server "$@"
+fi
+
+# allow the container to be started with `--user`
+if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
+	find . \! -user redis -exec chown redis '{}' +
+	exec su-exec redis "$0" "$@"
+fi
+
+# set an appropriate umask (if one isn't set already)
+# - https://github.com/docker-library/redis/issues/305
+# - https://github.com/redis/redis/blob/bb875603fb7ff3f9d19aad906bd45d7db98d9a39/utils/systemd-redis_server.service#L37
+um="$(umask)"
+if [ "$um" = '0022' ]; then
+	umask 0077
+fi
+
+exec "$@"