From eb6896684427fdf547e1146e936247b01dd6b3c6 Mon Sep 17 00:00:00 2001 From: Yorick Downe Date: Thu, 2 Jul 2026 13:03:33 +0100 Subject: [PATCH] wipe-db becomes wipe-cl-db --- caplin.yml | 16 ++++++++++++++++ erigon.yml | 13 ------------- ethd | 16 ++++++++-------- grandine-allin1.yml | 2 +- grandine-cl-only.yml | 13 ------------- grandine-plugin-allin1.yml | 2 +- grandine-plugin.yml | 2 +- nimbus-allin1.yml | 2 +- teku-allin1.yml | 2 +- 9 files changed, 29 insertions(+), 39 deletions(-) diff --git a/caplin.yml b/caplin.yml index 731cb5fac..a39c3f5c9 100644 --- a/caplin.yml +++ b/caplin.yml @@ -5,3 +5,19 @@ services: # Caplin consensus P2P ports - "${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp" - "${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp" + + wipe-cl-db: + profiles: ["tools"] + restart: "no" + image: alpine:3 + user: "10001" + volumes: + - erigon-el-data:/var/lib/erigon + - /etc/localtime:/etc/localtime:ro + entrypoint: ["/bin/sh", "-c"] + command: + - | + rm -rf /var/lib/erigon/caplin/* + +volumes: + erigon-el-data: diff --git a/erigon.yml b/erigon.yml index 29f592b8b..4edc78ecb 100644 --- a/erigon.yml +++ b/erigon.yml @@ -105,19 +105,6 @@ services: - metrics.network=${NETWORK} - logs.collect=true - wipe-db: - profiles: ["tools"] - restart: "no" - image: alpine:3 - user: "10001" - volumes: - - erigon-el-data:/var/lib/erigon - - /etc/localtime:/etc/localtime:ro - entrypoint: ["/bin/sh", "-c"] - command: - - | - rm -rf /var/lib/erigon/caplin/* - volumes: erigon-el-data: jwtsecret: diff --git a/ethd b/ethd index 2f612a312..de8fa3abe 100755 --- a/ethd +++ b/ethd @@ -2879,20 +2879,20 @@ resync-consensus() { case "${__value}" in *lighthouse.yml*|*lighthouse-cl-only.yml*) cl_volume='lhconsensus-data'; cl_client="lighthouse";; - *teku-allin1.yml*) cl_volume='wipe-db'; cl_client="teku";; + *teku-allin1.yml*) cl_volume='wipe-cl-db'; cl_client="teku";; *teku.yml*|*teku-cl-only.yml*) cl_volume='tekuconsensus-data'; cl_client="teku";; - *nimbus-allin1.yml*) cl_volume='wipe-db'; cl_client="nimbus";; + *nimbus-allin1.yml*) cl_volume='wipe-cl-db'; cl_client="nimbus";; *nimbus.yml*|*nimbus-cl-only.yml*) cl_volume='nimbus-consensus-data'; cl_client="nimbus";; *lodestar.yml*|*lodestar-cl-only.yml*) cl_volume='lsconsensus-data'; cl_client="lodestar";; *prysm.yml*|*prysm-cl-only.yml*) cl_volume='prysmconsensus-data'; cl_client="prysm";; - *grandine-plugin.yml*|*grandine-plugin-allin1.yml*) cl_volume='wipe-db'; cl_client="grandine-plugin";; - *grandine-allin1.yml*) cl_volume='wipe-db'; cl_client="grandine";; + *grandine-plugin.yml*|*grandine-plugin-allin1.yml*) cl_volume='wipe-cl-db'; cl_client="grandine-plugin";; + *grandine-allin1.yml*) cl_volume='wipe-cl-db'; cl_client="grandine";; *grandine.yml*|*grandine-cl-only.yml*) cl_volume='grandineconsensus-data'; cl_client="grandine";; - *erigon.yml*) cl_volume='wipe-db'; cl_client="caplin";; + *erigon.yml*) cl_volume='wipe-cl-db'; cl_client="caplin";; *) echo "You do not appear to be running a consensus layer client. Nothing to do."; return;; esac - if [[ ! "${cl_volume}" = "wipe-db" ]] && ! __dodocker volume ls -q \ + if [[ ! "${cl_volume}" = "wipe-cl-db" ]] && ! __dodocker volume ls -q \ | grep -qi "$(basename "$(realpath .)")[_-]${cl_volume}"; then echo "Did not find Docker volume for ${cl_client}. Nothing to do." return 0 @@ -2922,8 +2922,8 @@ resync-consensus() { else __docompose stop consensus && __docompose rm -f consensus fi - if [[ "${cl_volume}" = "wipe-db" ]]; then - __docompose run --rm wipe-db + if [[ "${cl_volume}" = "wipe-cl-db" ]]; then + __docompose run --rm wipe-cl-db else cl_volume="$(basename "$(realpath .)" | tr '[:upper:]' '[:lower:]')_${cl_volume}" __dodocker volume rm "$(__dodocker volume ls -q -f "name=${cl_volume}")" diff --git a/grandine-allin1.yml b/grandine-allin1.yml index ea53e3112..99cdc22ca 100644 --- a/grandine-allin1.yml +++ b/grandine-allin1.yml @@ -113,7 +113,7 @@ services: - metrics.network=${NETWORK} - logs.collect=true - wipe-db: + wipe-cl-db: profiles: ["tools"] restart: "no" image: alpine:3 diff --git a/grandine-cl-only.yml b/grandine-cl-only.yml index e867c9e5d..c30e7fe52 100644 --- a/grandine-cl-only.yml +++ b/grandine-cl-only.yml @@ -102,19 +102,6 @@ services: - metrics.network=${NETWORK} - logs.collect=true - wipe-db: - profiles: ["tools"] - restart: "no" - image: alpine:3 - user: "10002" - volumes: - - grandineconsensus-data:/var/lib/grandine - - /etc/localtime:/etc/localtime:ro - entrypoint: ["/bin/sh", "-c"] - command: - - | - rm -rf /var/lib/grandine/${NETWORK}/beacon/* - volumes: grandineconsensus-data: jwtsecret: diff --git a/grandine-plugin-allin1.yml b/grandine-plugin-allin1.yml index e56b25dcd..b1d18d17e 100644 --- a/grandine-plugin-allin1.yml +++ b/grandine-plugin-allin1.yml @@ -35,7 +35,7 @@ services: # No metrics scrape at present via labels. # Create an extra scrape target for execution:8008 in prometheus/conf.d - wipe-db: + wipe-cl-db: profiles: ["tools"] restart: "no" image: alpine:3 diff --git a/grandine-plugin.yml b/grandine-plugin.yml index 9c16370a0..f0f2d42f8 100644 --- a/grandine-plugin.yml +++ b/grandine-plugin.yml @@ -35,7 +35,7 @@ services: # No metrics scrape at present via labels. # Create an extra scrape target for execution:8008 in prometheus/conf.d - wipe-db: + wipe-cl-db: profiles: ["tools"] restart: "no" image: alpine:3 diff --git a/nimbus-allin1.yml b/nimbus-allin1.yml index 8847e29b4..84c6ed9f3 100644 --- a/nimbus-allin1.yml +++ b/nimbus-allin1.yml @@ -101,7 +101,7 @@ services: - metrics.network=${NETWORK} - logs.collect=true - wipe-db: + wipe-cl-db: profiles: ["tools"] restart: "no" image: alpine:3 diff --git a/teku-allin1.yml b/teku-allin1.yml index 00aaa2474..982428df7 100644 --- a/teku-allin1.yml +++ b/teku-allin1.yml @@ -116,7 +116,7 @@ services: - metrics.network=${NETWORK} - logs.collect=true - wipe-db: + wipe-cl-db: profiles: ["tools"] restart: "no" image: alpine:3