Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(docker/holesky): cleanup docker compose files #657

Merged
merged 6 commits into from
Jan 14, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(docker/holesky): cleanup compose files
thedevbirb committed Jan 14, 2025
commit d10b237d8945317719d9f1ce03f7b8038b223128
11 changes: 11 additions & 0 deletions testnets/holesky/docker-compose.pbs.yml
Original file line number Diff line number Diff line change
@@ -62,6 +62,9 @@ services:
- "41050:50050/udp"
entrypoint:
["/bin/sh", "-c", "chmod +x /scripts/run-bn.sh && /scripts/run-bn.sh"]
# In case the sidecar on `docker-compose.yml` needs to connect to it
networks:
- bolt-holesky-default

helix-relay:
image: ghcr.io/chainbound/helix:v0.3.0-alpha.rc4
@@ -81,3 +84,11 @@ services:
- RUST_LOG=helix_cmd=debug,helix_api=debug,helix_common=debug,helix_datastore=debug,helix_housekeeper=debug,helix_database=debug,helix_beacon_client=debug,helix_website=debug
- RUST_BACKTRACE=1
command: --config /helix-config.yml
# `mev-boost` inside `docker-compose.yml` needs to communicate with this relay
networks:
- bolt-holesky-default

# Requires spinning up docker compose with file `docker-compose.yml` before this one.
networks:
bolt-holesky-default:
external: true
16 changes: 5 additions & 11 deletions testnets/holesky/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -21,17 +21,17 @@ services:
- ${BOLT_SIDECAR_DELEGATIONS_PATH:-/dev/null}:/etc/delegations.json
- ${BOLT_SIDECAR_KEYSTORE_PATH:-/dev/null}:/etc/keystores
- ${BOLT_SIDECAR_KEYSTORE_SECRETS_PATH:-/dev/null}:/etc/secrets
networks:
- bolt-default

bolt-mev-boost-holesky:
image: ghcr.io/chainbound/bolt-mev-boost:v0.3.0-alpha
container_name: bolt-mev-boost-holesky
restart: unless-stopped
env_file: ./mev-boost.env
entrypoint: /bin/sh -c '/app/mev-boost'
# MEV-Boost might need to communicate with the Helix relay in
# `docker-compose.pbs.yml` if the PBS stack is used.
networks:
- bolt-default
- bolt-holesky-default

bolt-prometheus-holesky:
image: prom/prometheus:v2.55.1
@@ -42,8 +42,6 @@ services:
- ./prometheus.yml:/etc/prometheus/prometheus.yml
- ./targets.json:/etc/prometheus/targets.json
- prometheus-data:/prometheus
networks:
- bolt-default

bolt-cadvisor-holesky:
image: gcr.io/cadvisor/cadvisor:latest
@@ -55,8 +53,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro
networks:
- bolt-default
command:
- --housekeeping_interval=10s
- --docker_only
@@ -71,9 +67,7 @@ services:
- ./grafana/datasources:/etc/grafana/provisioning/datasources
- grafana-data:/var/lib/grafana
networks:
- bolt-default
depends_on:
- bolt-prometheus-holesky
- bolt-holesky-default
thedevbirb marked this conversation as resolved.
Show resolved Hide resolved

volumes:
prometheus-data:
@@ -82,7 +76,7 @@ volumes:
driver: local

networks:
bolt-default:
bolt-holesky-default:
driver: bridge
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will have to add name: bolt-holesky-default here. Otherwise docker compose will prefix it with some bs and the name will differ in docker-compose.pbs.yml

Copy link
Contributor Author

@thedevbirb thedevbirb Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated this to drop all references to custom networks, after internal discussion we will use host.docker.internal as DNS and adding:

    extra_hosts:
      - host.docker.internal:host-gateway

On every service that needs to communicate with others which expose a port on the host machine

ipam:
driver: default