fix zk

indeedeng · Dec 20, 2024 · bb57bf2 · bb57bf2
1 parent 98ea2bb
commit bb57bf2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/docker-compose/ci-cadence-dependencies.yml b/docker-compose/ci-cadence-dependencies.yml
@@ -27,12 +27,15 @@ services:
     image: wurstmeister/zookeeper:latest
     ports:
       - "2181:2181"
+    healthcheck:
+      test: ["CMD-SHELL", "echo ruok | nc -w 2 zookeeper 4444"]
+      interval: 5s
+      timeout: 10s
+      retries: 3
     networks:
       - testing-network
   kafka:
     image: wurstmeister/kafka:2.12-2.1.1
-    depends_on:
-      - zookeeper
     ports:
       - "9092:9092"
     environment:
@@ -44,6 +47,9 @@ services:
       interval: 1s
       timeout: 60s
       retries: 60
+    depends_on:
+      zookeeper:
+        condition: service_healthy
     networks:
       - testing-network
   cadence:

diff --git a/docker-compose/ci-cadence-temporal-dependencies.yml b/docker-compose/ci-cadence-temporal-dependencies.yml
@@ -76,12 +76,15 @@ services:
     image: wurstmeister/zookeeper:latest
     ports:
       - "2181:2181"
+    healthcheck:
+      test: ["CMD-SHELL", "echo ruok | nc -w 2 zookeeper 4444"]
+      interval: 5s
+      timeout: 10s
+      retries: 3
     networks:
       - testing-network
   kafka:
     image: wurstmeister/kafka:2.12-2.1.1
-    depends_on:
-      - zookeeper
     ports:
       - "9092:9092"
     environment:
@@ -93,6 +96,9 @@ services:
       interval: 1s
       timeout: 60s
       retries: 60
+    depends_on:
+      zookeeper:
+        condition: service_healthy
     networks:
       - testing-network
   cadence:

diff --git a/docker-compose/integ-dependencies.yml b/docker-compose/integ-dependencies.yml
@@ -76,12 +76,15 @@ services:
     image: wurstmeister/zookeeper:latest
     ports:
       - "2181:2181"
+    healthcheck:
+      test: ["CMD-SHELL", "echo ruok | nc -w 2 zookeeper 4444"]
+      interval: 5s
+      timeout: 10s
+      retries: 3
     networks:
       - testing-network
   kafka:
     image: wurstmeister/kafka:2.12-2.1.1
-    depends_on:
-      - zookeeper
     ports:
       - "9092:9092"
     environment:
@@ -95,6 +98,9 @@ services:
       retries: 60 
     networks:
       - testing-network
+    depends_on:
+      zookeeper:
+        condition: service_healthy
   cadence:
     image: ubercadence/server:0.24.0-auto-setup
     ports: