From 65db15fe06aea3d554f9bef6a564c8700fc469c9 Mon Sep 17 00:00:00 2001
From: Shubham Gupta <69793468+shubham-cmyk@users.noreply.github.com>
Date: Mon, 25 Sep 2023 13:53:14 +0530
Subject: [PATCH 1/2] Update Dockerfile add node-conf  (#49)

* Update Dockerfile

* Update push-image.yaml
---
 .github/workflows/push-image.yaml | 4 ++--
 Dockerfile                        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push-image.yaml b/.github/workflows/push-image.yaml
index 5831e6e..1303f13 100644
--- a/.github/workflows/push-image.yaml
+++ b/.github/workflows/push-image.yaml
@@ -79,5 +79,5 @@ jobs:
           context: .
           file: Dockerfile.exporter
           platforms: linux/amd64,linux/arm64
-          push: true
-          tags: quay.io/opstree/redis-exporter:${{ env.REDIS_EXPORTER_VERSION }}
\ No newline at end of file
+          push: false
+          tags: quay.io/opstree/redis-exporter:${{ env.REDIS_EXPORTER_VERSION }}
diff --git a/Dockerfile b/Dockerfile
index 2df554e..85653d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,6 +55,7 @@ RUN chown -R 1000:0 /etc/redis && \
     chmod -R g+rw /node-conf
 
 VOLUME ["/data"]
+VOLUME ["/node-conf"]
 
 WORKDIR /data
 

From 80c5be7dff150679615579ea945e752e7358e5a7 Mon Sep 17 00:00:00 2001
From: Shubham Gupta <69793468+shubham-cmyk@users.noreply.github.com>
Date: Fri, 29 Sep 2023 20:25:01 +0530
Subject: [PATCH 2/2] remove v7 check (#53)

Signed-off-by: Shubham Gupta <iamshubhamgupta2001@gmail.com>
---
 entrypoint.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 265c4e8..4c99442 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -112,13 +112,10 @@ start_redis() {
             CLUSTER_ANNOUNCE_IP="${POD_IP}"
         fi
 
-        if [[ "${REDIS_MAJOR_VERSION}" != "v7" ]]; then
-          redis-server /etc/redis/redis.conf \
-          --cluster-announce-ip "${CLUSTER_ANNOUNCE_IP}" \
-          --cluster-announce-hostname "${POD_HOSTNAME}"
-        else
-          redis-server /etc/redis/redis.conf
-        fi
+        redis-server /etc/redis/redis.conf \
+        --cluster-announce-ip "${CLUSTER_ANNOUNCE_IP}" \
+        --cluster-announce-hostname "${POD_HOSTNAME}"
+
     else
         echo "Starting redis service in standalone mode....."
         redis-server /etc/redis/redis.conf