update web image in docker compose (#6680)

cadence-workflow · Feb 20, 2025 · c5c3d6a · c5c3d6a
1 parent 622fdce
commit c5c3d6a
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 53 deletions.
diff --git a/docker/buildkite/docker-compose-local-replication-simulation.yml b/docker/buildkite/docker-compose-local-replication-simulation.yml
@@ -138,31 +138,21 @@ services:
         aliases:
           - cadence-cluster1
 
-  cadence-web0:
+  cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence-cluster0:7933"
+      - "CADENCE_GRPC_PEERS=cadence-cluster0:7833,cadence-cluster1:7833"
+      - "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
+      - "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
     ports:
       - "8088:8088"
     depends_on:
       - cadence-cluster0
-    networks:
-      services-network:
-        aliases:
-          - cadence-web0
-
-  cadence-web1:
-    image: ubercadence/web:latest
-    environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence-cluster1:7933"
-    ports:
-      - "8089:8088"
-    depends_on:
       - cadence-cluster1
     networks:
       services-network:
         aliases:
-          - cadence-web1
+          - cadence-web
 
   cadence-worker0:
     build:
@@ -246,13 +236,11 @@ services:
         condition: service_started
       cadence-worker0:
         condition: service_started
-      cadence-web0:
-        condition: service_started
       cadence-cluster1:
         condition: service_started
       cadence-worker1:
         condition: service_started
-      cadence-web1:
+      cadence-web:
         condition: service_started
       grafana:
         condition: service_started

diff --git a/docker/docker-compose-async-wf-kafka.yml b/docker/docker-compose-async-wf-kafka.yml
@@ -60,7 +60,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-es-v7.yml b/docker/docker-compose-es-v7.yml
@@ -80,7 +80,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-es.yml b/docker/docker-compose-es.yml
@@ -79,7 +79,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-http-api.yml b/docker/docker-compose-http-api.yml
@@ -54,7 +54,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-multiclusters-cass-mysql-es.yaml b/docker/docker-compose-multiclusters-cass-mysql-es.yaml
@@ -134,18 +134,13 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833,cadence-secondary:7833"
+      - "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
+      - "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
     ports:
       - "8088:8088"
     depends_on:
       - cadence
-  cadence-web-secondary:
-    image: ubercadence/web:latest
-    environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence-secondary:7933"
-    ports:
-      - "8089:8088"
-    depends_on:
       - cadence-secondary
   grafana:
     image: grafana/grafana

diff --git a/docker/docker-compose-multiclusters-es.yml b/docker/docker-compose-multiclusters-es.yml
@@ -131,18 +131,13 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833,cadence-secondary:7833"
+      - "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
+      - "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
     ports:
       - "8088:8088"
     depends_on:
       - cadence
-  cadence-web-secondary:
-    image: ubercadence/web:latest
-    environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence-secondary:7933"
-    ports:
-      - "8089:8088"
-    depends_on:
       - cadence-secondary
   grafana:
     image: grafana/grafana

diff --git a/docker/docker-compose-multiclusters.yml b/docker/docker-compose-multiclusters.yml
@@ -86,18 +86,13 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833,cadence-secondary:7833"
+      - "CADENCE_GRPC_SERVICES_NAMES=cadence-frontend,cadence-frontend"
+      - "CADENCE_CLUSTERS_NAMES=cluster0,cluster1"
     ports:
       - "8088:8088"
     depends_on:
       - cadence
-  cadence-web-secondary:
-    image: ubercadence/web:latest
-    environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence-secondary:7933"
-    ports:
-      - "8089:8088"
-    depends_on:
       - cadence-secondary
   grafana:
     image: grafana/grafana

diff --git a/docker/docker-compose-mysql.yml b/docker/docker-compose-mysql.yml
@@ -43,7 +43,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-oauth.yml b/docker/docker-compose-oauth.yml
@@ -44,7 +44,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-pinot.yml b/docker/docker-compose-pinot.yml
@@ -102,7 +102,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-postgres.yml b/docker/docker-compose-postgres.yml
@@ -44,7 +44,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-scylla.yml b/docker/docker-compose-scylla.yml
@@ -41,7 +41,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose-statsd.yml b/docker/docker-compose-statsd.yml
@@ -39,7 +39,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -54,7 +54,7 @@ services:
   cadence-web:
     image: ubercadence/web:latest
     environment:
-      - "CADENCE_TCHANNEL_PEERS=cadence:7933"
+      - "CADENCE_GRPC_PEERS=cadence:7833"
     ports:
       - "8088:8088"
     depends_on: