Skip to content

Commit c5c3d6a

Browse files
Assem-UberAssem-Uber
authored
update web image in docker compose (cadence-workflow#6680)
1 parent 622fdce commit c5c3d6a

15 files changed

+26
-53
lines changed

‎docker/buildkite/docker-compose-local-replication-simulation.yml

+6-18
Original file line numberDiff line numberDiff line change
@@ -138,31 +138,21 @@ services:
138138
aliases:
139139
- cadence-cluster1
140140

141-
cadence-web0:
141+
cadence-web:
142142
image: ubercadence/web:latest
143143
environment:
144-
- "CADENCE_TCHANNEL_PEERS=cadence-cluster0:7933"
144+
- "CADENCE_GRPC_PEERS=cadence-cluster0:7833,cadence-cluster1:7833"
145+
- "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
146+
- "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
145147
ports:
146148
- "8088:8088"
147149
depends_on:
148150
- cadence-cluster0
149-
networks:
150-
services-network:
151-
aliases:
152-
- cadence-web0
153-
154-
cadence-web1:
155-
image: ubercadence/web:latest
156-
environment:
157-
- "CADENCE_TCHANNEL_PEERS=cadence-cluster1:7933"
158-
ports:
159-
- "8089:8088"
160-
depends_on:
161151
- cadence-cluster1
162152
networks:
163153
services-network:
164154
aliases:
165-
- cadence-web1
155+
- cadence-web
166156

167157
cadence-worker0:
168158
build:
@@ -246,13 +236,11 @@ services:
246236
condition: service_started
247237
cadence-worker0:
248238
condition: service_started
249-
cadence-web0:
250-
condition: service_started
251239
cadence-cluster1:
252240
condition: service_started
253241
cadence-worker1:
254242
condition: service_started
255-
cadence-web1:
243+
cadence-web:
256244
condition: service_started
257245
grafana:
258246
condition: service_started

‎docker/docker-compose-async-wf-kafka.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ services:
6060
cadence-web:
6161
image: ubercadence/web:latest
6262
environment:
63-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
63+
- "CADENCE_GRPC_PEERS=cadence:7833"
6464
ports:
6565
- "8088:8088"
6666
depends_on:

‎docker/docker-compose-es-v7.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ services:
8080
cadence-web:
8181
image: ubercadence/web:latest
8282
environment:
83-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
83+
- "CADENCE_GRPC_PEERS=cadence:7833"
8484
ports:
8585
- "8088:8088"
8686
depends_on:

‎docker/docker-compose-es.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ services:
7979
cadence-web:
8080
image: ubercadence/web:latest
8181
environment:
82-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
82+
- "CADENCE_GRPC_PEERS=cadence:7833"
8383
ports:
8484
- "8088:8088"
8585
depends_on:

‎docker/docker-compose-http-api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
cadence-web:
5555
image: ubercadence/web:latest
5656
environment:
57-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
57+
- "CADENCE_GRPC_PEERS=cadence:7833"
5858
ports:
5959
- "8088:8088"
6060
depends_on:

‎docker/docker-compose-multiclusters-cass-mysql-es.yaml

+3-8
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,13 @@ services:
134134
cadence-web:
135135
image: ubercadence/web:latest
136136
environment:
137-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
137+
- "CADENCE_GRPC_PEERS=cadence:7833,cadence-secondary:7833"
138+
- "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
139+
- "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
138140
ports:
139141
- "8088:8088"
140142
depends_on:
141143
- cadence
142-
cadence-web-secondary:
143-
image: ubercadence/web:latest
144-
environment:
145-
- "CADENCE_TCHANNEL_PEERS=cadence-secondary:7933"
146-
ports:
147-
- "8089:8088"
148-
depends_on:
149144
- cadence-secondary
150145
grafana:
151146
image: grafana/grafana

‎docker/docker-compose-multiclusters-es.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,13 @@ services:
131131
cadence-web:
132132
image: ubercadence/web:latest
133133
environment:
134-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
134+
- "CADENCE_GRPC_PEERS=cadence:7833,cadence-secondary:7833"
135+
- "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
136+
- "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
135137
ports:
136138
- "8088:8088"
137139
depends_on:
138140
- cadence
139-
cadence-web-secondary:
140-
image: ubercadence/web:latest
141-
environment:
142-
- "CADENCE_TCHANNEL_PEERS=cadence-secondary:7933"
143-
ports:
144-
- "8089:8088"
145-
depends_on:
146141
- cadence-secondary
147142
grafana:
148143
image: grafana/grafana

‎docker/docker-compose-multiclusters.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,13 @@ services:
8686
cadence-web:
8787
image: ubercadence/web:latest
8888
environment:
89-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
89+
- "CADENCE_GRPC_PEERS=cadence:7833,cadence-secondary:7833"
90+
- "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
91+
- "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
9092
ports:
9193
- "8088:8088"
9294
depends_on:
9395
- cadence
94-
cadence-web-secondary:
95-
image: ubercadence/web:latest
96-
environment:
97-
- "CADENCE_TCHANNEL_PEERS=cadence-secondary:7933"
98-
ports:
99-
- "8089:8088"
100-
depends_on:
10196
- cadence-secondary
10297
grafana:
10398
image: grafana/grafana

‎docker/docker-compose-mysql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
cadence-web:
4444
image: ubercadence/web:latest
4545
environment:
46-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
46+
- "CADENCE_GRPC_PEERS=cadence:7833"
4747
ports:
4848
- "8088:8088"
4949
depends_on:

‎docker/docker-compose-oauth.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
cadence-web:
4545
image: ubercadence/web:latest
4646
environment:
47-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
47+
- "CADENCE_GRPC_PEERS=cadence:7833"
4848
ports:
4949
- "8088:8088"
5050
depends_on:

‎docker/docker-compose-pinot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ services:
102102
cadence-web:
103103
image: ubercadence/web:latest
104104
environment:
105-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
105+
- "CADENCE_GRPC_PEERS=cadence:7833"
106106
ports:
107107
- "8088:8088"
108108
depends_on:

‎docker/docker-compose-postgres.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
cadence-web:
4545
image: ubercadence/web:latest
4646
environment:
47-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
47+
- "CADENCE_GRPC_PEERS=cadence:7833"
4848
ports:
4949
- "8088:8088"
5050
depends_on:

‎docker/docker-compose-scylla.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141
cadence-web:
4242
image: ubercadence/web:latest
4343
environment:
44-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
44+
- "CADENCE_GRPC_PEERS=cadence:7833"
4545
ports:
4646
- "8088:8088"
4747
depends_on:

‎docker/docker-compose-statsd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
cadence-web:
4040
image: ubercadence/web:latest
4141
environment:
42-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
42+
- "CADENCE_GRPC_PEERS=cadence:7833"
4343
ports:
4444
- "8088:8088"
4545
depends_on:

‎docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
cadence-web:
5555
image: ubercadence/web:latest
5656
environment:
57-
- "CADENCE_TCHANNEL_PEERS=cadence:7933"
57+
- "CADENCE_GRPC_PEERS=cadence:7833"
5858
ports:
5959
- "8088:8088"
6060
depends_on:

0 commit comments

Comments
 (0)