Skip to content

Commit

Permalink
Revert "First step for v6 support (eth-educators#1315)" (eth-educator…
Browse files Browse the repository at this point in the history 
…s#1318)

This reverts commit 52f887b.
  • Loading branch information
@yorickdowne
yorickdowne authored Apr 18, 2023
1 parent 06833de commit 4f8a1f1
Show file tree
Hide file tree
Showing 24 changed files with 48 additions and 55 deletions.
4 changes: 2 additions & 2 deletions besu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ services:
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/besu/ee-secret
ports:
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
- ${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
networks:
default:
aliases:
Expand Down
2 changes: 1 addition & 1 deletion cl-shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ version: "3.9"
services:
consensus:
ports:
- ${HOST_IP:-}:${CL_REST_PORT:-5052}:${CL_REST_PORT:-5052}/tcp
- ${HOST_IP:-0.0.0.0}:${CL_REST_PORT:-5052}:${CL_REST_PORT:-5052}/tcp
2 changes: 1 addition & 1 deletion ee-shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version: "3.9"
services:
execution:
ports:
- ${HOST_IP:-}:${EE_PORT}:${EE_PORT:-8551}/tcp
- ${HOST_IP:-0.0.0.0}:${EE_PORT}:${EE_PORT:-8551}/tcp
4 changes: 2 additions & 2 deletions el-shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ version: "3.9"
services:
execution:
ports:
- ${HOST_IP:-}:${EL_RPC_PORT}:${EL_RPC_PORT:-8545}/tcp
- ${HOST_IP:-}:${EL_WS_PORT}:${EL_WS_PORT:-8546}/tcp
- ${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
16 changes: 8 additions & 8 deletions erigon.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ services:
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/erigon/ee-secret
ports:
- ${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
- ${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
# torrent ports
- ${HOST_IP:-}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/tcp
- ${HOST_IP:-}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions geth.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ services:
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/goethereum/ee-secret
ports:
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
- ${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
networks:
default:
aliases:
Expand Down
2 changes: 1 addition & 1 deletion grafana-shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"
services:
grafana:
ports:
- ${HOST_IP:-}:${GRAFANA_PORT}:${GRAFANA_PORT}/tcp
- ${HOST_IP:-0.0.0.0}:${GRAFANA_PORT}:${GRAFANA_PORT}/tcp
# prometheus:
# ports:
# - 9090:9090/tcp
4 changes: 2 additions & 2 deletions lighthouse-cl-only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ services:
- CL_EXTRAS=${CL_EXTRAS:-}
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions lighthouse.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ services:
- CL_EXTRAS=${CL_EXTRAS:-}
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions lodestar-cl-only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ services:
- CL_EXTRAS=${CL_EXTRAS:-}
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
<<: *logging
entrypoint:
- docker-entrypoint.sh
Expand Down
4 changes: 2 additions & 2 deletions lodestar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ services:
- CL_EXTRAS=${CL_EXTRAS:-}
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
<<: *logging
entrypoint:
- docker-entrypoint.sh
Expand Down
4 changes: 2 additions & 2 deletions nethermind.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ services:
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/nethermind/ee-secret
ports:
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions nimbus-cl-only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ services:
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=true
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions nimbus-el.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ services:
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/nimbus/ee-secret
ports:
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions nimbus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ services:
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions prysm-cl-only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ services:
- CL_EXTRAS=${CL_EXTRAS:-}
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
ports:
- ${HOST_IP:-}:${PRYSM_PORT}:${PRYSM_PORT}/tcp
- ${HOST_IP:-}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp
- ${HOST_IP:-0.0.0.0}:${PRYSM_PORT}:${PRYSM_PORT}/tcp
- ${HOST_IP:-0.0.0.0}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp
networks:
default:
aliases:
Expand Down
2 changes: 1 addition & 1 deletion prysm-web-shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ version: "3.9"
services:
validator:
ports:
- ${HOST_IP:-}:${KEY_API_PORT:-7500}:${KEY_API_PORT:-7500}/tcp
- ${HOST_IP:-0.0.0.0}:${KEY_API_PORT:-7500}:${KEY_API_PORT:-7500}/tcp
4 changes: 2 additions & 2 deletions prysm.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ services:
- CL_EXTRAS=${CL_EXTRAS:-}
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
ports:
- ${HOST_IP:-}:${PRYSM_PORT}:${PRYSM_PORT}/tcp
- ${HOST_IP:-}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp
- ${HOST_IP:-0.0.0.0}:${PRYSM_PORT}:${PRYSM_PORT}/tcp
- ${HOST_IP:-0.0.0.0}:${PRYSM_UDP_PORT}:${PRYSM_UDP_PORT}/udp
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions reth.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ services:
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/reth/ee-secret
ports:
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
- ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions teku-cl-only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ services:
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=true
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions teku.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ services:
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${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
networks:
default:
aliases:
Expand Down
4 changes: 2 additions & 2 deletions traefik-aws.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ services:
- --metrics
- --metrics.prometheus
ports:
- ${HOST_IP:-}:${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp
- ${HOST_IP:-}:${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp
- ${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
environment:
- AWS_PROFILE=${AWS_PROFILE}
- AWS_HOSTED_ZONE_ID=${AWS_HOSTED_ZONE_ID}
Expand Down
4 changes: 2 additions & 2 deletions traefik-cf.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ services:
- --metrics.prometheus

ports:
- ${HOST_IP:-}:${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp
- ${HOST_IP:-}:${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp
- ${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
environment:
- CLOUDFLARE_EMAIL=${CF_EMAIL}
- CLOUDFLARE_DNS_API_TOKEN=${CF_API_TOKEN}
Expand Down
7 changes: 0 additions & 7 deletions v6-network.yml
View file

This file was deleted.

0 comments on commit 4f8a1f1

Please sign in to comment.