Skip to content

Commit b0a1205

Browse files
committed
Add more deps
1 parent f927d38 commit b0a1205

File tree

3 files changed

+44
-11
lines changed

3 files changed

+44
-11
lines changed

docker-compose/ci-cadence-dependencies.yml

+19-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,16 @@ services:
2929
- "2181:2181"
3030
networks:
3131
- testing-network
32+
healthcheck:
33+
test: [ "CMD-SHELL", "echo ruok | nc -w 2 zookeeper 2181" ]
34+
interval: 5s
35+
timeout: 10s
36+
retries: 3
3237
kafka:
3338
image: wurstmeister/kafka:2.12-2.1.1
3439
depends_on:
35-
- zookeeper
40+
zookeeper:
41+
condition: service_healthy
3642
ports:
3743
- "9092:9092"
3844
environment:
@@ -41,6 +47,12 @@ services:
4147
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
4248
networks:
4349
- testing-network
50+
healthcheck:
51+
test:
52+
[ "CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181" ]
53+
interval: 1s
54+
timeout: 60s
55+
retries: 60
4456
cadence:
4557
image: ubercadence/server:0.24.0-auto-setup
4658
ports:
@@ -61,9 +73,12 @@ services:
6173
- "ES_VERSION=v7"
6274
- "KAFKA_SEEDS=kafka"
6375
depends_on:
64-
- cassandra
65-
- kafka
66-
- elasticsearch
76+
cassandra:
77+
condition: service_started
78+
kafka:
79+
condition: service_healthy
80+
elasticsearch:
81+
condition: service_started
6782
networks:
6883
- testing-network
6984
cadence-admin-tools:

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

+19-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,16 @@ services:
7878
- "2181:2181"
7979
networks:
8080
- testing-network
81+
healthcheck:
82+
test: [ "CMD-SHELL", "echo ruok | nc -w 2 zookeeper 2181" ]
83+
interval: 5s
84+
timeout: 10s
85+
retries: 3
8186
kafka:
8287
image: wurstmeister/kafka:2.12-2.1.1
8388
depends_on:
84-
- zookeeper
89+
zookeeper:
90+
condition: service_healthy
8591
ports:
8692
- "9092:9092"
8793
environment:
@@ -90,6 +96,12 @@ services:
9096
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
9197
networks:
9298
- testing-network
99+
healthcheck:
100+
test:
101+
[ "CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181" ]
102+
interval: 1s
103+
timeout: 60s
104+
retries: 60
93105
cadence:
94106
image: ubercadence/server:0.24.0-auto-setup
95107
ports:
@@ -110,9 +122,12 @@ services:
110122
- "ES_VERSION=v7"
111123
- "KAFKA_SEEDS=kafka"
112124
depends_on:
113-
- cassandra
114-
- kafka
115-
- elasticsearch
125+
cassandra:
126+
condition: service_started
127+
kafka:
128+
condition: service_healthy
129+
elasticsearch:
130+
condition: service_started
116131
networks:
117132
- testing-network
118133
cadence-admin-tools:

docker-compose/integ-dependencies.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,12 @@ services:
122122
- "ES_VERSION=v7"
123123
- "KAFKA_SEEDS=kafka"
124124
depends_on:
125-
- cassandra
126-
- kafka
127-
- elasticsearch
125+
cassandra:
126+
condition: service_started
127+
kafka:
128+
condition: service_healthy
129+
elasticsearch:
130+
condition: service_started
128131
networks:
129132
- testing-network
130133
cadence-admin-tools:

0 commit comments

Comments
 (0)