From eed5009bb9c478b506ae7ddf625d11654de92301 Mon Sep 17 00:00:00 2001
From: iamabhishek-dubey <abhishekbhardwaj510@gmail.com>
Date: Tue, 17 Aug 2021 19:16:16 +0530
Subject: [PATCH] Added code for external configuration

Signed-off-by: iamabhishek-dubey <abhishekbhardwaj510@gmail.com>
---
 Makefile          | 2 +-
 create-cluster.sh | 5 +++++
 entrypoint.sh     | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100755 create-cluster.sh

diff --git a/Makefile b/Makefile
index 93ce0bc..e79eb7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 build-redis-image:
-	docker build -t quay.io/opstree/redis:6.2 -f Dockerfile .
+	docker build -t quay.io/opstree/redis:6.2.5 -f Dockerfile .
 
 build-redis-exporter-image:
 	docker build -t opstree/redis-exporter:1.0 -f Dockerfile.exporter .
diff --git a/create-cluster.sh b/create-cluster.sh
new file mode 100755
index 0000000..65bdde9
--- /dev/null
+++ b/create-cluster.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+PODS="$1"
+
+yes yes | redis-cli --cluster create ${PODS}
diff --git a/entrypoint.sh b/entrypoint.sh
index 19db7f8..7890ac0 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,6 +5,7 @@ set -a
 CLUSTER_DIRECTORY=${CLUSTER_DIRECTORY:-"/opt/redis"}
 PERSISTENCE_ENABLED=${PERSISTENCE_ENABLED:-"false"}
 DATA_DIR=${DATA_DIR:-"/data"}
+EXTERNAL_CONFIG_FILE=${EXTERNAL_CONFIG_FILE:-"/etc/redis/external.conf.d/redis-external.conf"}
 
 apply_permissions() {
     chgrp -R 0 /etc/redis
@@ -64,6 +65,10 @@ persistence_setup() {
     fi
 }
 
+external_config() {
+    echo "include ${EXTERNAL_CONFIG_FILE}" >> /etc/redis/redis.conf
+}
+
 start_redis() {
     if [[ "${SETUP_MODE}" == "cluster" ]]; then
         echo "Starting redis service in cluster mode....."
@@ -75,6 +80,9 @@ start_redis() {
 }
 
 main_function() {
+    if [[ -f "${EXTERNAL_CONFIG_FILE}" ]]; then
+        external_config
+    fi
     common_operation
     set_redis_password
     redis_mode_setup
-- 
2.26.0