Skip to content

Commit

Permalink
Merge branch 'main' into kalo/multi-cluster-setup
Browse files Browse the repository at this point in the history
  • Loading branch information
bussyjd committed Dec 20, 2024
2 parents 08408e6 + 2b67639 commit ad4044f
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 6 deletions.
8 changes: 7 additions & 1 deletion .env.sample.holesky
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/
# Connect to one or more external beacon nodes. Use a comma separated list excluding spaces.
#CHARON_BEACON_NODE_ENDPOINTS=

# Increase the duration charon will wait for requests to the beacon node
#CHARON_BEACON_NODE_TIMEOUT=

# Increase the duration charon will wait while publishing data to the beacon node
#CHARON_BEACON_NODE_SUBMIT_TIMEOUT=

# Override the charon logging level; debug, info, warning, error.
#CHARON_LOG_LEVEL=

Expand Down Expand Up @@ -127,4 +133,4 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/

# Grafana Loki docker container image version, e.g. `latest` or `2.8.2`.
# See available tags https://hub.docker.com/r/grafana/loki/tags.
#LOKI_VERSION=
#LOKI_VERSION=
8 changes: 7 additions & 1 deletion .env.sample.mainnet
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://mainnet.checkpoint.sigp.io/
# Connect to one or more external beacon nodes. Use a comma separated list excluding spaces.
#CHARON_BEACON_NODE_ENDPOINTS=

# Increase the duration charon will wait for requests to the beacon node
#CHARON_BEACON_NODE_TIMEOUT=

# Increase the duration charon will wait while publishing data to the beacon node
#CHARON_BEACON_NODE_SUBMIT_TIMEOUT=

# Override the charon logging level; debug, info, warning, error.
#CHARON_LOG_LEVEL=

Expand Down Expand Up @@ -127,4 +133,4 @@ MEVBOOST_RELAYS=https://0xa15b52576bcbf1072f4a011c0f99f9fb6c66f3e1ff321f11f461d1

# Grafana Loki docker container image version, e.g. `latest` or `2.8.2`.
# See available tags https://hub.docker.com/r/grafana/loki/tags.
#LOKI_VERSION=
#LOKI_VERSION=
34 changes: 34 additions & 0 deletions .github/workflows/dispath-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Dispatch Update Version

on:
repository_dispatch:
types: [update-version]

jobs:
update-version:
runs-on: ubuntu-latest
steps:
- name: Checkout this repository
uses: actions/checkout@v4

- name: Extract tag name
run: echo "TAG_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV

- name: Update version in Ansible configuration
run: |
TAG_NAME="$(echo "${TAG_NAME}" | sed 's/^v//')"
sed -i -E 's|(image: obolnetwork/charon:\$\{CHARON_VERSION:-)v\.?[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9\-]*}|\1v'"${TAG_NAME}"'}|' docker-compose.yml
sed -i -E 's|(image: obolnetwork/charon:\$\{CHARON_VERSION:-)v\.?[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9\-]*}|\1v'"${TAG_NAME}"'}|' relay/docker-compose.yml
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
base: main
branch: update-version-${{ env.TAG_NAME }}
title: "Update version to ${{ env.TAG_NAME }}"
body: "Automatically generated PR to update version to ${{ env.TAG_NAME }}"
commit-message: "Update version to ${{ env.TAG_NAME }}"
author-name: "obol-platform"
author-email: "[email protected]"
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
# |_| |_|\___|\__|_| |_|\___|_| |_| |_| |_|_|_| |_|\__,_|
nethermind:
profiles: ["base", ""]
image: nethermind/nethermind:${NETHERMIND_VERSION:-1.28.0}
image: nethermind/nethermind:${NETHERMIND_VERSION:-1.29.0}
restart: unless-stopped
ports:
- ${NETHERMIND_PORT_P2P:-30303}:30303/tcp # P2P TCP
Expand Down Expand Up @@ -80,7 +80,7 @@ services:

charon:
profiles: ["cluster", ""]
image: obolnetwork/charon:${CHARON_VERSION:-v1.1.1}
image: obolnetwork/charon:${CHARON_VERSION:-v1.2.0}
environment:
CHARON_BEACON_NODE_ENDPOINTS: ${CHARON_BEACON_NODE_ENDPOINTS:-http://lighthouse:5052}
CHARON_LOG_LEVEL: ${CHARON_LOG_LEVEL:-info}
Expand Down Expand Up @@ -111,7 +111,7 @@ services:

lodestar:
profiles: ["cluster", ""]
image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2}
image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0}
depends_on: [charon]
entrypoint: /opt/lodestar/run.sh
networks: [dvnode]
Expand All @@ -133,7 +133,7 @@ services:
# |_| |_| |_|\___| \_/ |_.__/ \___/ \___/|___/\__|
mev-boost:
profiles: ["base", ""]
image: ${MEVBOOST_IMAGE:-flashbots/mev-boost}:${MEVBOOST_VERSION:-1.7.0}
image: ${MEVBOOST_IMAGE:-flashbots/mev-boost}:${MEVBOOST_VERSION:-1.8.1}
command: |
-${NETWORK}
-loglevel=debug
Expand Down

0 comments on commit ad4044f

Please sign in to comment.