Merge branch 'compose_setup' into 'master'

[compose_setup][Add] Added compose setup for cluster and standalone mode

See merge request ot-docker/redis!8

Dockerfile

@@ -28,7 +28,9 @@ COPY redis.conf /etc/redis/redis.conf
 
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 
-COPY run.sh /usr/bin/run.sh
+COPY setupMasterSlave.sh /usr/bin/setupMasterSlave.sh
+
+COPY healthcheck.sh /usr/bin/healthcheck.sh
 
 VOLUME ["/data"]
 

Makefile

@@ -5,7 +5,11 @@ build-redis-exporter-image:
 	docker build -t opstree/redis-exporter:dev -f Dockerfile.exporter .
 
 setup-standalone-server-compose:
-	docker-compose up -f docker-compose-standalone.yaml -d
+	docker-compose -f docker-compose-standalone.yaml up -d
 
 setup-cluster-compose:
-	docker-compose up -f docker-compose.yaml -d
+	docker-compose -f docker-compose.yaml up -d
+	docker-compose exec redis-master-3 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
+	docker-compose exec redis-slave-1 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
+	docker-compose exec redis-slave-2 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
+	docker-compose exec redis-slave-3 /bin/bash -c "/usr/bin/setupMasterSlave.sh"

docker-compose-standalone.yaml

+version: '3.3'
+services:
+  redis:
+    image: opstree/redis:1.0
+    restart: always
+    expose:
+      - 6379
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: standalone

docker-compose.yaml

+version: '3.3'
+services:
+  redis-master-1:
+    image: opstree/redis:1.0
+    restart: always
+    networks:
+      redis:
+        ipv4_address: 10.5.0.2
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: cluster
+      SERVER_MODE: master
+    healthcheck:
+      test: ["CMD-SHELL", "/bin/bash /usr/bin/healthcheck.sh"]
+
+  redis-master-2:
+    image: opstree/redis:1.0
+    restart: always
+    networks:
+      redis:
+        ipv4_address: 10.5.0.3
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: cluster
+      SERVER_MODE: master
+    healthcheck:
+      test: ["CMD-SHELL", "/bin/bash /usr/bin/healthcheck.sh"]
+
+  redis-master-3:
+    image: opstree/redis:1.0
+    restart: always
+    networks:
+      redis:
+        ipv4_address: 10.5.0.4
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: cluster
+      SERVER_MODE: master
+      MASTER_LIST: "10.5.0.2:6379 10.5.0.3:6379 10.5.0.4:6379"
+    healthcheck:
+      test: ["CMD-SHELL", "/bin/bash /usr/bin/healthcheck.sh"]
+
+  redis-slave-1:
+    image: opstree/redis:1.0
+    restart: always
+    networks:
+      redis:
+        ipv4_address: 10.5.0.5
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: cluster
+      SERVER_MODE: slave
+      SLAVE_IP: "10.5.0.5:6379"
+      MASTER_IP: "10.5.0.2:6379"
+    healthcheck:
+      test: ["CMD-SHELL", "/bin/bash /usr/bin/healthcheck.sh"]
+
+  redis-slave-2:
+    image: opstree/redis:1.0
+    restart: always
+    networks:
+      redis:
+        ipv4_address: 10.5.0.6
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: cluster
+      SERVER_MODE: slave
+      SLAVE_IP: "10.5.0.6:6379"
+      MASTER_IP: "10.5.0.3:6379"
+    healthcheck:
+      test: ["CMD-SHELL", "/bin/bash /usr/bin/healthcheck.sh"]
+
+  redis-slave-3:
+    image: opstree/redis:1.0
+    restart: always
+    networks:
+      redis:
+        ipv4_address: 10.5.0.7
+    environment:
+      REDIS_PASSWORD: "Opstree@12345"
+      SETUP_MODE: cluster
+      SERVER_MODE: slave
+      SLAVE_IP: "10.5.0.7:6379"
+      MASTER_IP: "10.5.0.4:6379"
+    healthcheck:
+      test: ["CMD-SHELL", "/bin/bash /usr/bin/healthcheck.sh"]
+
+networks:
+  redis:
+    driver: bridge
+    ipam:
+     config:
+       - subnet: 10.5.0.0/16

healthcheck.sh

+#!/bin/bash
+
+check_redis_health() {
+    if [[ -z "${REDIS_PASSWORD}" ]]; then
+        redis-cli ping
+    else
+        redis-cli -a ${REDIS_PASSWORD} ping
+    fi
+}
+
+check_redis_health

run.sh → setupMasterSlave.sh

@@ -3,12 +3,17 @@
 redis_server_mode() {
     if [[ "${SERVER_MODE}" == "master" ]]; then
         echo "Redis server mode is master"
+        if [[ -z "${REDIS_PASSWORD}" ]]; then
+             redis-cli --cluster create "${MASTER_LIST}" --cluster-yes
+        else
+            redis-cli --cluster create ${MASTER_LIST} --cluster-yes -a "${REDIS_PASSWORD}"
+        fi 
     elif [[ "${SERVER_MODE}" == "slave" ]]; then
         echo "Redis server mode is slave"
         if [[ -z "${REDIS_PASSWORD}" ]]; then
-            redis-cli --add-node "${SLAVE_IP}" "${MASTER_IP}" --cluster-slave
+            redis-cli --cluster add-node ${SLAVE_IP} ${MASTER_IP} --cluster-slave
         else
-            redis-cli --add-node "${SLAVE_IP}" "${MASTER_IP}" --cluster-slave -a "${REDIS_PASSWORD}"
+            redis-cli --cluster add-node ${SLAVE_IP} ${MASTER_IP} --cluster-slave -a "${REDIS_PASSWORD}"
         fi
     else
         echo "Redis server mode is standalone"