Using multiple files to avoid name conflicts

Author: OisinKyne

Makefile

@@ -0,0 +1,14 @@
+.PHONY: up down restart logs
+
+COMPOSE=docker compose -f docker-compose.yml -f compose-grandine.yml
+
+up:
+	$(COMPOSE) up -d
+
+down:
+	$(COMPOSE) down
+
+restart: down up
+
+logs:
+	$(COMPOSE) logs -f

compose-grandine.yml

@@ -0,0 +1,35 @@
+# Override any defaults specified by `${FOO:-bar}` in `.env` with `FOO=qux`.
+# ${VARIABLE:-default} evaluates to default if VARIABLE is unset or empty in the environment.
+# ${VARIABLE-default} evaluates to default only if VARIABLE is unset in the environment.
+
+services:
+  #                            _ _            
+  #   __ _ _ __ __ _ _ __   __| (_)_ __   ___ 
+  #  / _` | '__/ _` | '_ \ / _` | | '_ \ / _ \
+  # | (_| | | | (_| | | | | (_| | | | | |  __/
+  #  \__, |_|  \__,_|_| |_|\__,_|_|_| |_|\___|
+  #  |___/                  
+
+  beacon:
+    profiles: [cl_grandine]
+    image: sifrai/grandine:${GRANDINE_VERSION:-1.1.1}
+    restart: unless-stopped
+    command:
+      - --datadir=/root/.grandine
+      - --eth1-rpc-urls=http://execution:8551
+      - --jwt-secret=/jwt
+      - --http-address=0.0.0.0
+      - --http-port=5052
+      - --network=${NETWORK}
+      - --metrics
+      - --metrics-port=5054
+      - --metrics-address=0.0.0.0
+      - --checkpoint-sync-url=${LIGHTHOUSE_CHECKPOINT_SYNC_URL}
+      - --builder=http://mev:18550
+    ports:
+      - 9000:9000     # TCP + UDP LibP2P
+    volumes:
+      - ./data/grandine:/data
+      - ./jwt:/jwt:ro
+    networks:
+      - dvnode

docker-compose.yml

@@ -8,9 +8,9 @@ services:
   # | '_ \ / _ \ __| '_ \ / _ \ '__| '_ ` _ \| | '_ \ / _` |
   # | | | |  __/ |_| | | |  __/ |  | | | | | | | | | | (_| |
   # |_| |_|\___|\__|_| |_|\___|_|  |_| |_| |_|_|_| |_|\__,_|
-  nethermind:
+  execution:
     profiles: [el_nethermind]
-    image: nethermind/nethermind:${NETHERMIND_VERSION:-1.31.11}
+    image: nethermind/nethermind:${NETHERMIND_VERSION:-1.32.2}
     restart: unless-stopped
     ports:
       - ${NETHERMIND_PORT_P2P:-30303}:30303/tcp # P2P TCP
@@ -46,7 +46,7 @@ services:
   # |_|_|\__, |_| |_|\__|_| |_|\___/ \__,_|___/\___|
   #      |___/
 
-  lighthouse:
+  beacon:
     profiles: [cl_lighthouse]
     image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v7.0.1}
     ports:
@@ -59,10 +59,10 @@ services:
       --network=${NETWORK}
       --checkpoint-sync-url=${LIGHTHOUSE_CHECKPOINT_SYNC_URL}
       --checkpoint-sync-url-timeout=600
-      --execution-endpoint=http://nethermind:8551
+      --execution-endpoint=http://execution:8551
       --execution-jwt=/opt/jwt/jwt.hex
       --datadir=/opt/app/beacon/
-      --builder=http://mev-boost:18550
+      --builder=http://mev:18550
       --http
       --http-address=0.0.0.0
       --http-port=5052
@@ -85,9 +85,9 @@ services:
 
   charon:
     profiles: [dv_charon]
-    image: obolnetwork/charon:${CHARON_VERSION:-v1.4.3}
+    image: obolnetwork/charon:${CHARON_VERSION:-v1.5.0-rc4}
     environment:
-      - CHARON_BEACON_NODE_ENDPOINTS=${CHARON_BEACON_NODE_ENDPOINTS:-http://lighthouse:5052}
+      - CHARON_BEACON_NODE_ENDPOINTS=${CHARON_BEACON_NODE_ENDPOINTS:-http://beacon:5052}
       - CHARON_BEACON_NODE_HEADERS=${CHARON_BEACON_NODE_HEADERS:-}
       - CHARON_BEACON_NODE_TIMEOUT=${CHARON_BEACON_NODE_TIMEOUT:-3s}
       - CHARON_BEACON_NODE_SUBMIT_TIMEOUT=${CHARON_BEACON_NODE_SUBMIT_TIMEOUT:-4s}
@@ -121,7 +121,7 @@ services:
   # | | (_) | (_| |  __/\__ \ || (_| | |
   # |_|\___/ \__,_|\___||___/\__\__,_|_|
 
-  lodestar:
+  validator:
     profiles: [vc_lodestar]
     image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.29.0}
     depends_on: [charon]
@@ -145,7 +145,7 @@ services:
   #  | '_ ` _ \ / _ \ \ / /____| '_ \ / _ \ / _ \/ __| __|
   #  | | | | | |  __/\ V /_____| |_) | (_) | (_) \__ \ |_
   #  |_| |_| |_|\___| \_/      |_.__/ \___/ \___/|___/\__|
-  mev-boost:
+  mev:
     profiles: [mev_mevboost]
     image: ${MEVBOOST_IMAGE:-flashbots/mev-boost}:${MEVBOOST_VERSION:-1.9}
     command: |
@@ -170,7 +170,7 @@ services:
   #                                                |___/
 
   prometheus:
-    image: prom/prometheus:${PROMETHEUS_VERSION:-v2.46.0}
+    image: prom/prometheus:${PROMETHEUS_VERSION:-v2.53.5}
     user: ":"
     networks: [dvnode]
     volumes:
@@ -193,7 +193,7 @@ services:
     restart: unless-stopped
 
   loki:
-    image: grafana/loki:${LOKI_VERSION:-2.8.2}
+    image: grafana/loki:${LOKI_VERSION:-2.9.15}
     user: ":"
     networks: [dvnode]
     command: -config.file=/etc/loki/loki.yml