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.

Sign up for GitHub

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

Jump to bottom

update docker-compose.yml and README.md for v0.17.0 #123

Merged
merged 6 commits into from
Aug 22, 2023
Merged

update docker-compose.yml and README.md for v0.17.0 #123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7364c40
update docker-compose.yml and README.md for v0.17.0
gsora Jul 12, 2023
b3db7f7
update charon version
gsora Jul 12, 2023
bfc612a
Make new create cluster output the same as the old structure so peopl…
OisinKyne Aug 21, 2023
7e1539f
Remove most of the readme and add warnings
OisinKyne Aug 21, 2023
f70cc05
Missed an important '.'
OisinKyne Aug 21, 2023
19976aa
Add back in sample
OisinKyne Aug 21, 2023
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
1 change: 0 additions & 1 deletion .charon/sample
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ Ensure you have [docker](https://docs.docker.com/engine/install/) and [git](http
docker run --rm -v "$(pwd):/opt/charon" obolnetwork/charon:v0.15.0 create cluster \
gsora marked this conversation as resolved.
Show resolved Hide resolved
--withdrawal-addresses "$WITHDRAWAL_ADDRS" \
--fee-recipient-addresses "$FEE_RECIPIENT_ADDRS" \
--name "$CLUSTER_NAME" --nodes 6 --threshold 5 --num-validators $NUM_VALS --network goerli
--name "$CLUSTER_NAME" --nodes 6 --threshold 5 --num-validators $NUM_VALS --network goerli \
--cluster-dir=/opt/charon/cluster-nodes
```

1. Start the cluster
Expand Down
40 changes: 20 additions & 20 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ version: "3.8"
x-node-base:
# Pegged charon version (update this for each release).
&node-base
image: obolnetwork/charon:${CHARON_VERSION:-v0.16.0}
image: obolnetwork/charon:${CHARON_VERSION:-v0.17.0}
restart: unless-stopped
networks: [ cluster ]
depends_on: [ relay ]
volumes:
- ./.charon:/opt/charon/.charon/
- ./cluster-nodes:/opt/charon/cluster-nodes

x-node-env:
&node-env
Expand Down Expand Up @@ -98,53 +98,53 @@ services:
<<: *node-base
environment:
<<: *node-env
CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node0/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/.charon/cluster/node0/cluster-lock.json
CHARON_PRIVATE_KEY_FILE: /opt/charon/cluster-nodes/node0/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/cluster-nodes/node0/cluster-lock.json
CHARON_JAEGER_SERVICE: node0
CHARON_P2P_EXTERNAL_HOSTNAME: node0

node1:
<<: *node-base
environment:
<<: *node-env
CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node1/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/.charon/cluster/node1/cluster-lock.json
CHARON_PRIVATE_KEY_FILE: /opt/charon/cluster-nodes/node1/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/cluster-nodes/node1/cluster-lock.json
CHARON_JAEGER_SERVICE: node1
CHARON_P2P_EXTERNAL_HOSTNAME: node1

node2:
<<: *node-base
environment:
<<: *node-env
CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node2/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/.charon/cluster/node2/cluster-lock.json
CHARON_PRIVATE_KEY_FILE: /opt/charon/cluster-nodes/node2/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/cluster-nodes/node2/cluster-lock.json
CHARON_JAEGER_SERVICE: node2
CHARON_P2P_EXTERNAL_HOSTNAME: node2

node3:
<<: *node-base
environment:
<<: *node-env
CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node3/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/.charon/cluster/node3/cluster-lock.json
CHARON_PRIVATE_KEY_FILE: /opt/charon/cluster-nodes/node3/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/cluster-nodes/node3/cluster-lock.json
CHARON_JAEGER_SERVICE: node3
CHARON_P2P_EXTERNAL_HOSTNAME: node3

node4:
<<: *node-base
environment:
<<: *node-env
CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node4/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/.charon/cluster/node4/cluster-lock.json
CHARON_PRIVATE_KEY_FILE: /opt/charon/cluster-nodes/node4/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/cluster-nodes/node4/cluster-lock.json
CHARON_JAEGER_SERVICE: node4
CHARON_P2P_EXTERNAL_HOSTNAME: node4

node5:
<<: *node-base
environment:
<<: *node-env
CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node5/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/.charon/cluster/node5/cluster-lock.json
CHARON_PRIVATE_KEY_FILE: /opt/charon/cluster-nodes/node5/charon-enr-private-key
CHARON_LOCK_FILE: /opt/charon/cluster-nodes/node5/cluster-lock.json
CHARON_JAEGER_SERVICE: node5
CHARON_P2P_EXTERNAL_HOSTNAME: node5

Expand Down Expand Up @@ -177,7 +177,7 @@ services:
ETH2_NETWORK: ${ETH2_NETWORK:-goerli}
volumes:
- ./lighthouse/run.sh:/opt/lighthouse/run.sh
- .charon/cluster/node0/validator_keys:/opt/charon/keys
- ./cluster-nodes/node0/validator_keys:/opt/charon/keys

vc1-teku:
image: consensys/teku:${TEKU_VERSION:-23.5.0}
Expand All @@ -189,7 +189,7 @@ services:
--beacon-node-api-endpoint="http://node1:3600"
--config-file "/opt/charon/teku/teku-config.yaml"
volumes:
- .charon/cluster/node1/validator_keys:/opt/charon/validator_keys
- ./cluster-nodes/node1/validator_keys:/opt/charon/validator_keys
- ./teku:/opt/charon/teku

vc2-nimbus:
Expand All @@ -200,7 +200,7 @@ services:
environment:
NODE: node2
volumes:
- .charon/cluster/node2/validator_keys:/home/validator_keys
- ./cluster-nodes/node2/validator_keys:/home/validator_keys
- ./nimbus:/home/user/data

vc3-lighthouse:
Expand All @@ -214,7 +214,7 @@ services:
ETH2_NETWORK: ${ETH2_NETWORK:-goerli}
volumes:
- ./lighthouse/run.sh:/opt/lighthouse/run.sh
- .charon/cluster/node3/validator_keys:/opt/charon/keys
- ./cluster-nodes/node3/validator_keys:/opt/charon/keys

vc4-teku:
image: consensys/teku:${TEKU_VERSION:-23.5.0}
Expand All @@ -226,7 +226,7 @@ services:
--beacon-node-api-endpoint="http://node4:3600"
--config-file "/opt/charon/teku/teku-config.yaml"
volumes:
- .charon/cluster/node4/validator_keys:/opt/charon/validator_keys
- ./cluster-nodes/node4/validator_keys:/opt/charon/validator_keys
- ./teku:/opt/charon/teku

vc5-nimbus:
Expand All @@ -237,7 +237,7 @@ services:
environment:
NODE: node5
volumes:
- .charon/cluster/node5/validator_keys:/home/validator_keys
- ./cluster-nodes/node5/validator_keys:/home/validator_keys
- ./nimbus:/home/user/data

# _ _ _
Expand Down