From 52f887be82800bebb30102935a117e1d6e522cda Mon Sep 17 00:00:00 2001 From: yorickdowne <71337066+yorickdowne@users.noreply.github.com> Date: Mon, 17 Apr 2023 14:01:58 -0400 Subject: [PATCH] First step for v6 support (#1315) --- besu.yml | 4 ++-- cl-shared.yml | 2 +- ee-shared.yml | 2 +- el-shared.yml | 4 ++-- erigon.yml | 16 ++++++++-------- geth.yml | 4 ++-- grafana-shared.yml | 2 +- lighthouse-cl-only.yml | 4 ++-- lighthouse.yml | 4 ++-- lodestar-cl-only.yml | 4 ++-- lodestar.yml | 4 ++-- nethermind.yml | 4 ++-- nimbus-cl-only.yml | 4 ++-- nimbus-el.yml | 4 ++-- nimbus.yml | 4 ++-- prysm-cl-only.yml | 4 ++-- prysm-web-shared.yml | 2 +- prysm.yml | 4 ++-- reth.yml | 4 ++-- teku-cl-only.yml | 4 ++-- teku.yml | 4 ++-- traefik-aws.yml | 4 ++-- traefik-cf.yml | 4 ++-- v6-network.yml | 7 +++++++ 24 files changed, 55 insertions(+), 48 deletions(-) create mode 100644 v6-network.yml diff --git a/besu.yml b/besu.yml index 203422a3..953d3ef0 100644 --- a/besu.yml +++ b/besu.yml @@ -29,8 +29,8 @@ services: - /etc/localtime:/etc/localtime:ro - jwtsecret:/var/lib/besu/ee-secret ports: - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp networks: default: aliases: diff --git a/cl-shared.yml b/cl-shared.yml index eb19369c..b3fb7d31 100644 --- a/cl-shared.yml +++ b/cl-shared.yml @@ -2,4 +2,4 @@ version: "3.9" services: consensus: ports: - - ${HOST_IP:-0.0.0.0}:${CL_REST_PORT:-5052}:${CL_REST_PORT:-5052}/tcp + - ${HOST_IP:-}:${CL_REST_PORT:-5052}:${CL_REST_PORT:-5052}/tcp diff --git a/ee-shared.yml b/ee-shared.yml index 698ae624..001f5960 100644 --- a/ee-shared.yml +++ b/ee-shared.yml @@ -4,4 +4,4 @@ version: "3.9" services: execution: ports: - - ${HOST_IP:-0.0.0.0}:${EE_PORT}:${EE_PORT:-8551}/tcp + - ${HOST_IP:-}:${EE_PORT}:${EE_PORT:-8551}/tcp diff --git a/el-shared.yml b/el-shared.yml index 286b4472..09b14844 100644 --- a/el-shared.yml +++ b/el-shared.yml @@ -3,5 +3,5 @@ version: "3.9" services: execution: ports: - - ${HOST_IP:-0.0.0.0}:${EL_RPC_PORT}:${EL_RPC_PORT:-8545}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_WS_PORT}:${EL_WS_PORT:-8546}/tcp + - ${HOST_IP:-}:${EL_RPC_PORT}:${EL_RPC_PORT:-8545}/tcp + - ${HOST_IP:-}:${EL_WS_PORT}:${EL_WS_PORT:-8546}/tcp diff --git a/erigon.yml b/erigon.yml index 99630d75..c181110b 100644 --- a/erigon.yml +++ b/erigon.yml @@ -28,15 +28,15 @@ services: - /etc/localtime:/etc/localtime:ro - jwtsecret:/var/lib/erigon/ee-secret ports: - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp - - ${HOST_IP:-0.0.0.0}:${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/tcp - - ${HOST_IP:-0.0.0.0}:${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/udp - - ${HOST_IP:-0.0.0.0}:${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/tcp - - ${HOST_IP:-0.0.0.0}:${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/udp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp + - ${HOST_IP:-}:${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/tcp + - ${HOST_IP:-}:${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/udp + - ${HOST_IP:-}:${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/tcp + - ${HOST_IP:-}:${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/udp # torrent ports - - ${HOST_IP:-0.0.0.0}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/tcp - - ${HOST_IP:-0.0.0.0}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/udp + - ${HOST_IP:-}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/tcp + - ${HOST_IP:-}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/udp networks: default: aliases: diff --git a/geth.yml b/geth.yml index 9dfedf45..8b008b28 100644 --- a/geth.yml +++ b/geth.yml @@ -29,8 +29,8 @@ services: - /etc/localtime:/etc/localtime:ro - jwtsecret:/var/lib/goethereum/ee-secret ports: - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp networks: default: aliases: diff --git a/grafana-shared.yml b/grafana-shared.yml index 1be2987b..ccb2b5d1 100644 --- a/grafana-shared.yml +++ b/grafana-shared.yml @@ -2,7 +2,7 @@ version: "3.9" services: grafana: ports: - - ${HOST_IP:-0.0.0.0}:${GRAFANA_PORT}:${GRAFANA_PORT}/tcp + - ${HOST_IP:-}:${GRAFANA_PORT}:${GRAFANA_PORT}/tcp # prometheus: # ports: # - 9090:9090/tcp diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml index ba6eed97..3611f4d6 100644 --- a/lighthouse-cl-only.yml +++ b/lighthouse-cl-only.yml @@ -33,8 +33,8 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-} ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp networks: default: aliases: diff --git a/lighthouse.yml b/lighthouse.yml index ab520ea1..e7b365c9 100644 --- a/lighthouse.yml +++ b/lighthouse.yml @@ -33,8 +33,8 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-} ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp networks: default: aliases: diff --git a/lodestar-cl-only.yml b/lodestar-cl-only.yml index 5df2e528..f0a98757 100644 --- a/lodestar-cl-only.yml +++ b/lodestar-cl-only.yml @@ -33,8 +33,8 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-} ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp <<: *logging entrypoint: - docker-entrypoint.sh diff --git a/lodestar.yml b/lodestar.yml index d7923609..ca436a2e 100644 --- a/lodestar.yml +++ b/lodestar.yml @@ -33,8 +33,8 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-} ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp <<: *logging entrypoint: - docker-entrypoint.sh diff --git a/nethermind.yml b/nethermind.yml index 81b2f964..410eb759 100644 --- a/nethermind.yml +++ b/nethermind.yml @@ -30,8 +30,8 @@ services: - /etc/localtime:/etc/localtime:ro - jwtsecret:/var/lib/nethermind/ee-secret ports: - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp networks: default: aliases: diff --git a/nimbus-cl-only.yml b/nimbus-cl-only.yml index fa0da8a9..f834caf8 100644 --- a/nimbus-cl-only.yml +++ b/nimbus-cl-only.yml @@ -39,8 +39,8 @@ services: - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=true ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp networks: default: aliases: diff --git a/nimbus-el.yml b/nimbus-el.yml index 09572111..1ab81004 100644 --- a/nimbus-el.yml +++ b/nimbus-el.yml @@ -29,8 +29,8 @@ services: - /etc/localtime:/etc/localtime:ro - jwtsecret:/var/lib/nimbus/ee-secret ports: - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp networks: default: aliases: diff --git a/nimbus.yml b/nimbus.yml index eb9b2d49..83ebd4f3 100644 --- a/nimbus.yml +++ b/nimbus.yml @@ -39,8 +39,8 @@ services: - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false} ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp networks: default: aliases: diff --git a/prysm-cl-only.yml b/prysm-cl-only.yml index b05116be..4b323e84 100644 --- a/prysm-cl-only.yml +++ b/prysm-cl-only.yml @@ -36,8 +36,8 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-} ports: - - ${HOST_IP:-0.0.0.0}:${PRYSM_PORT}:${PRYSM_PORT}/tcp - - ${HOST_IP:-0.0.0.0}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp + - ${HOST_IP:-}:${PRYSM_PORT}:${PRYSM_PORT}/tcp + - ${HOST_IP:-}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp networks: default: aliases: diff --git a/prysm-web-shared.yml b/prysm-web-shared.yml index 031a0ef4..baeff60c 100644 --- a/prysm-web-shared.yml +++ b/prysm-web-shared.yml @@ -2,4 +2,4 @@ version: "3.9" services: validator: ports: - - ${HOST_IP:-0.0.0.0}:${KEY_API_PORT:-7500}:${KEY_API_PORT:-7500}/tcp + - ${HOST_IP:-}:${KEY_API_PORT:-7500}:${KEY_API_PORT:-7500}/tcp diff --git a/prysm.yml b/prysm.yml index 64edc2df..c4240e94 100644 --- a/prysm.yml +++ b/prysm.yml @@ -36,8 +36,8 @@ services: - CL_EXTRAS=${CL_EXTRAS:-} - ARCHIVE_NODE=${ARCHIVE_NODE:-} ports: - - ${HOST_IP:-0.0.0.0}:${PRYSM_PORT}:${PRYSM_PORT}/tcp - - ${HOST_IP:-0.0.0.0}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp + - ${HOST_IP:-}:${PRYSM_PORT}:${PRYSM_PORT}/tcp + - ${HOST_IP:-}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp networks: default: aliases: diff --git a/reth.yml b/reth.yml index 8185cf18..db91db1f 100644 --- a/reth.yml +++ b/reth.yml @@ -29,8 +29,8 @@ services: - /etc/localtime:/etc/localtime:ro - jwtsecret:/var/lib/reth/ee-secret ports: - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp - - ${HOST_IP:-0.0.0.0}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp + - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp networks: default: aliases: diff --git a/teku-cl-only.yml b/teku-cl-only.yml index 95e428a0..ce66e416 100644 --- a/teku-cl-only.yml +++ b/teku-cl-only.yml @@ -38,8 +38,8 @@ services: - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=true ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp networks: default: aliases: diff --git a/teku.yml b/teku.yml index 2489bf9a..4dc2e299 100644 --- a/teku.yml +++ b/teku.yml @@ -38,8 +38,8 @@ services: - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false} ports: - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - - ${HOST_IP:-0.0.0.0}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp + - ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp networks: default: aliases: diff --git a/traefik-aws.yml b/traefik-aws.yml index b91c9e3e..10dae968 100644 --- a/traefik-aws.yml +++ b/traefik-aws.yml @@ -33,8 +33,8 @@ services: - --metrics - --metrics.prometheus ports: - - ${HOST_IP:-0.0.0.0}:${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp - - ${HOST_IP:-0.0.0.0}:${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp + - ${HOST_IP:-}:${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp + - ${HOST_IP:-}:${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp environment: - AWS_PROFILE=${AWS_PROFILE} - AWS_HOSTED_ZONE_ID=${AWS_HOSTED_ZONE_ID} diff --git a/traefik-cf.yml b/traefik-cf.yml index 11c0179d..36298259 100644 --- a/traefik-cf.yml +++ b/traefik-cf.yml @@ -32,8 +32,8 @@ services: - --metrics.prometheus ports: - - ${HOST_IP:-0.0.0.0}:${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp - - ${HOST_IP:-0.0.0.0}:${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp + - ${HOST_IP:-}:${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp + - ${HOST_IP:-}:${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp environment: - CLOUDFLARE_EMAIL=${CF_EMAIL} - CLOUDFLARE_DNS_API_TOKEN=${CF_API_TOKEN} diff --git a/v6-network.yml b/v6-network.yml new file mode 100644 index 00000000..978aa787 --- /dev/null +++ b/v6-network.yml @@ -0,0 +1,7 @@ +# Add this to COMPOSE_FILE in .env so docker compose assigns v6 addresses +# Docker will also need to be configured, please see http://eth-docker.net/Support/ipv6.md +version: "3.9" + +networks: + default: + enable_ipv6: true