Fix cadence kafka container startup order issue

docker-compose/ci-cadence-dependencies.yml

@@ -27,18 +27,29 @@ 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:
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
       KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "unset" , "JMX_PORT" ,";" ,"kafka-topics.sh","--zookeeper","zookeeper:2181","--list" ]
+      interval: 1s
+      timeout: 60s
+      retries: 60
+    depends_on:
+      zookeeper:
+        condition: service_healthy
     networks:
       - testing-network
   cadence:
@@ -61,9 +72,12 @@ services:
       - "ES_VERSION=v7"
       - "KAFKA_SEEDS=kafka"
     depends_on:
-      - cassandra
-      - kafka
-      - elasticsearch
+      cassandra:
+        condition: service_started
+      kafka:
+        condition: service_healthy
+      elasticsearch:
+        condition: service_started
     networks:
       - testing-network
   cadence-admin-tools:

docker-compose/ci-cadence-temporal-dependencies.yml

@@ -76,18 +76,29 @@ 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:
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
       KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "unset" , "JMX_PORT" ,";" ,"kafka-topics.sh","--zookeeper","zookeeper:2181","--list" ]
+      interval: 1s
+      timeout: 60s
+      retries: 60
+    depends_on:
+      zookeeper:
+        condition: service_healthy
     networks:
       - testing-network
   cadence:
@@ -110,9 +121,12 @@ services:
       - "ES_VERSION=v7"
       - "KAFKA_SEEDS=kafka"
     depends_on:
-      - cassandra
-      - kafka
-      - elasticsearch
+      cassandra:
+        condition: service_started
+      kafka:
+        condition: service_healthy
+      elasticsearch:
+        condition: service_started
     networks:
       - testing-network
   cadence-admin-tools:

docker-compose/integ-dependencies.yml

@@ -76,20 +76,31 @@ 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:
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
       KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "unset" , "JMX_PORT" ,";" ,"kafka-topics.sh","--zookeeper","zookeeper:2181","--list" ]
+      interval: 1s
+      timeout: 60s
+      retries: 60 
     networks:
       - testing-network
+    depends_on:
+      zookeeper:
+        condition: service_healthy
   cadence:
     image: ubercadence/server:0.24.0-auto-setup
     ports:
@@ -110,9 +121,12 @@ services:
       - "ES_VERSION=v7"
       - "KAFKA_SEEDS=kafka"
     depends_on:
-      - cassandra
-      - kafka
-      - elasticsearch
+      cassandra:
+        condition: service_started
+      kafka:
+        condition: service_healthy
+      elasticsearch:
+        condition: service_started
     networks:
       - testing-network
   cadence-admin-tools: