Support Teku failover client; legacy compose version to 3.9

ladidan · Aug 22, 2022 · c04e56e · c04e56e
1 parent cb1fb54
commit c04e56e
Show file tree

Hide file tree

Showing 43 changed files with 45 additions and 45 deletions.
diff --git a/akula.yml b/akula.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/alerts.yml b/alerts.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   alertmanager:
     restart: "unless-stopped"

diff --git a/besu.yml b/besu.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/blox-ssv.yml b/blox-ssv.yml
@@ -1,5 +1,5 @@
 #Deprecated v1 testnet, will eventually be removed or changed
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/blox-ssv2.yml b/blox-ssv2.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/cl-shared.yml b/cl-shared.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   consensus:
     ports:

diff --git a/consensus-keyapi-localport.yml b/consensus-keyapi-localport.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   consensus:
     ports:

diff --git a/default.env b/default.env
@@ -106,8 +106,8 @@ JWT_SECRET=
 DISTRIBUTED=
 # Authenticated execution client endpoint. This default uses the execution node container.
 EL_NODE=http://execution:8551
-# Consensus client address. This could be comma-separated for Lighthouse, with failover,
-# or could just be a remote consensus client URL for Teku, Lighthouse or Prysm "validator only" setups. Not in use for Nimbus.
+# Consensus client address. This could be comma-separated for Lighthouse or Teku VC clients, with failover,
+# or could just be a remote consensus client URL for "validator only" setups. Not in use for Nimbus.
 CL_NODE=http://consensus:5052
 
 # You can set specific version targets and choose binary or compiled from source builds below,

diff --git a/deposit-cli.yml b/deposit-cli.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   deposit-cli-new:
     profiles: ["tools"]

diff --git a/ee-shared.yml b/ee-shared.yml
@@ -1,6 +1,6 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml or geth.yml
 # For distributed setups only. Please be very cautious when exposing your engine API
-version: "3.4"
+version: "3.9"
 services:
   execution:
     ports:

diff --git a/ee-traefik.yml b/ee-traefik.yml
@@ -1,6 +1,6 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml or geth.yml
 # For distributed setups only. Please be very cautious when exposing your engine port
-version: "3.4"
+version: "3.9"
 services:
   execution:
     labels:

diff --git a/el-shared.yml b/el-shared.yml
@@ -1,5 +1,5 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml or geth.yml
-version: "3.4"
+version: "3.9"
 services:
   execution:
     ports:

diff --git a/el-traefik.yml b/el-traefik.yml
@@ -1,5 +1,5 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml or geth.yml
-version: "3.4"
+version: "3.9"
 services:
   execution:
     labels:

diff --git a/erigon.yml b/erigon.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/geth.yml b/geth.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/grafana-localhost.yml b/grafana-localhost.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   grafana:
     ports:

diff --git a/grafana-shared.yml b/grafana-shared.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   grafana:
     ports:

diff --git a/grafana.yml b/grafana.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/lh-slasher.yml b/lh-slasher.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   consensus:
     command:

diff --git a/lighthouse-base.yml b/lighthouse-base.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/lighthouse-vc-only.yml b/lighthouse-vc-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/lodestar-base.yml b/lodestar-base.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/lodestar-cl-only.yml b/lodestar-cl-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/mev-boost.yml b/mev-boost.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/nethermind.yml b/nethermind.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/nimbus-base.yml b/nimbus-base.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/nimbus-cl-only.yml b/nimbus-cl-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/prometheus-traefik.yml b/prometheus-traefik.yml
@@ -1,5 +1,5 @@
 # Prometheus federation, or other reasons to have prometheus through traefik
-version: "3.4"
+version: "3.9"
 services:
   prometheus:
     labels:

diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
@@ -5,7 +5,7 @@ COPY ./none.yml /etc/prometheus
 COPY ./choose-config.sh /usr/local/bin/choose-config.sh
 
 # For reference and local testing with docker; this is otherwise set by docker-compose
-ENV CLIENT=lh-base
+ENV CLIENT=lighthouse-base
 
 ENTRYPOINT choose-config.sh
 CMD ["/bin/prometheus", "--storage.tsdb.path=/prometheus", "--web.console.libraries=/usr/share/prometheus/console_libraries", "--web.console.templates=/usr/share/prometheus/consoles"]
diff --git a/prysm-base.yml b/prysm-base.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/prysm-cl-only.yml b/prysm-cl-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/prysm-slasher.yml b/prysm-slasher.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   consensus:
     command:

diff --git a/prysm-stats.yml b/prysm-stats.yml
@@ -1,5 +1,5 @@
 # Send client stats to beaconcha.in service
-version: "3.4"
+version: "3.9"
 services:
   consensus:
     command:

diff --git a/prysm-vc-only.yml b/prysm-vc-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/prysm-web-shared.yml b/prysm-web-shared.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   validator:
     ports:

diff --git a/teku-base.yml b/teku-base.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/teku-cl-only.yml b/teku-cl-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/teku-vc-only.yml b/teku-vc-only.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file
@@ -26,7 +26,7 @@ services:
       - docker-entrypoint-vc.sh
       - /opt/teku/bin/teku
       - validator-client
-      - --beacon-node-api-endpoint=${CL_NODE:-http://consensus:5052}
+      - --beacon-node-api-endpoints=${CL_NODE:-http://consensus:5052}
       - --data-path=/var/lib/teku
       - --log-destination=CONSOLE
       - --network=auto

diff --git a/traefik-aws.yml b/traefik-aws.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/traefik-cf.yml b/traefik-cf.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file

diff --git a/validator-keyapi-localport.yml b/validator-keyapi-localport.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.9"
 services:
   validator:
     ports: