From efd15dddd6dd903dcc9d78451ae1a05a26259001 Mon Sep 17 00:00:00 2001 From: iamabhishek-dubey Date: Mon, 23 Mar 2020 17:27:51 +0530 Subject: [PATCH] Added healthcheck --- Dockerfile | 4 +++- Makefile | 8 ++++---- docker-compose.yaml | 29 ++++++++++++----------------- run.sh => setupMasterSlave.sh | 0 4 files changed, 19 insertions(+), 22 deletions(-) rename run.sh => setupMasterSlave.sh (100%) diff --git a/Dockerfile b/Dockerfile index d73a427..e77f160 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,12 @@ 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 VOLUME ["/data"] WORKDIR /data +EXPOSE 6379 + ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/Makefile b/Makefile index 0b973e8..17ce532 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ setup-standalone-server-compose: setup-cluster-compose: docker-compose -f docker-compose.yaml up -d - docker-compose exec redis-master-3 /bin/bash -c "/usr/bin/run.sh" - docker-compose exec redis-slave-1 /bin/bash -c "/usr/bin/run.sh" - docker-compose exec redis-slave-2 /bin/bash -c "/usr/bin/run.sh" - docker-compose exec redis-slave-3 /bin/bash -c "/usr/bin/run.sh" + 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" diff --git a/docker-compose.yaml b/docker-compose.yaml index aee53de..246fec6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,6 +10,8 @@ services: REDIS_PASSWORD: "Opstree@12345" SETUP_MODE: cluster SERVER_MODE: master + healthcheck: + test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"] redis-master-2: image: opstree/redis:1.0 @@ -21,8 +23,8 @@ services: REDIS_PASSWORD: "Opstree@12345" SETUP_MODE: cluster SERVER_MODE: master - depends_on: - - redis-master-1 + healthcheck: + test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"] redis-master-3: image: opstree/redis:1.0 @@ -35,9 +37,8 @@ services: SETUP_MODE: cluster SERVER_MODE: master MASTER_LIST: "10.5.0.2:6379 10.5.0.3:6379 10.5.0.4:6379" - depends_on: - - redis-master-1 - - redis-master-2 + healthcheck: + test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"] redis-slave-1: image: opstree/redis:1.0 @@ -51,10 +52,8 @@ services: SERVER_MODE: slave SLAVE_IP: "10.5.0.5:6379" MASTER_IP: "10.5.0.2:6379" - depends_on: - - redis-master-1 - - redis-master-2 - - redis-master-3 + healthcheck: + test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"] redis-slave-2: image: opstree/redis:1.0 @@ -68,10 +67,8 @@ services: SERVER_MODE: slave SLAVE_IP: "10.5.0.6:6379" MASTER_IP: "10.5.0.3:6379" - depends_on: - - redis-master-1 - - redis-master-2 - - redis-master-3 + healthcheck: + test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"] redis-slave-3: image: opstree/redis:1.0 @@ -85,10 +82,8 @@ services: SERVER_MODE: slave SLAVE_IP: "10.5.0.7:6379" MASTER_IP: "10.5.0.4:6379" - depends_on: - - redis-master-1 - - redis-master-2 - - redis-master-3 + healthcheck: + test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"] networks: redis: diff --git a/run.sh b/setupMasterSlave.sh similarity index 100% rename from run.sh rename to setupMasterSlave.sh -- 2.26.0