Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion nimbus-allin1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ services:
- MEV_BUILD_FACTOR=${MEV_BUILD_FACTOR}
- MEV_NODE=${MEV_NODE}
- DOPPELGANGER=${DOPPELGANGER}
- LOG_LEVEL=${LOG_LEVEL}
- CL_EXTRAS=${CL_EXTRAS:-}
- VC_EXTRAS=${VC_EXTRAS:-}
- NODE_TYPE=${CL_NODE_TYPE:-pruned}
Expand Down Expand Up @@ -93,6 +92,7 @@ services:
- --keymanager-allow-origin=*
- --keymanager-token-file=/var/lib/nimbus/api-token.txt
- --suggested-fee-recipient=${FEE_RECIPIENT}
- --log-level=${LOG_LEVEL}
labels:
- metrics.scrape=true
- metrics.path=/metrics
Expand Down
2 changes: 1 addition & 1 deletion nimbus-cl-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ services:
- MEV_BOOST=${MEV_BOOST}
- MEV_BUILD_FACTOR=${MEV_BUILD_FACTOR} # Unused, here to avoid runtime errors in case of faulty logic
- MEV_NODE=${MEV_NODE}
- LOG_LEVEL=${LOG_LEVEL}
- DOPPELGANGER=false
- CL_EXTRAS=${CL_EXTRAS:-}
- VC_EXTRAS=
Expand Down Expand Up @@ -76,6 +75,7 @@ services:
- --metrics-port=8008
- --metrics-address=0.0.0.0
- --suggested-fee-recipient=${FEE_RECIPIENT}
- --log-level=${LOG_LEVEL}
labels:
- metrics.scrape=true
- metrics.path=/metrics
Expand Down
2 changes: 1 addition & 1 deletion nimbus-vc-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ services:
- MEV_BUILD_FACTOR=${MEV_BUILD_FACTOR}
- CL_NODE=${CL_NODE}
- DOPPELGANGER=${DOPPELGANGER}
- LOG_LEVEL=${LOG_LEVEL}
- VC_EXTRAS=${VC_EXTRAS:-}
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
Expand All @@ -61,6 +60,7 @@ services:
- --keymanager-allow-origin=*
- --keymanager-token-file=/var/lib/nimbus/api-token.txt
- --suggested-fee-recipient=${FEE_RECIPIENT}
- --log-level=${LOG_LEVEL}
labels:
- metrics.scrape=true
- metrics.path=/metrics
Expand Down
4 changes: 2 additions & 2 deletions nimbus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ services:
- MEV_BOOST=${MEV_BOOST}
- MEV_BUILD_FACTOR=${MEV_BUILD_FACTOR} # Unused, here to avoid runtime errors in case of faulty logic
- MEV_NODE=${MEV_NODE}
- LOG_LEVEL=${LOG_LEVEL}
- DOPPELGANGER=false
- CL_EXTRAS=${CL_EXTRAS:-}
- VC_EXTRAS=
Expand Down Expand Up @@ -76,6 +75,7 @@ services:
- --metrics-port=8008
- --metrics-address=0.0.0.0
- --suggested-fee-recipient=${FEE_RECIPIENT}
- --log-level=${LOG_LEVEL}
labels:
- metrics.scrape=true
- metrics.path=/metrics
Expand All @@ -100,7 +100,6 @@ services:
- MEV_BOOST=${MEV_BOOST}
- MEV_BUILD_FACTOR=${MEV_BUILD_FACTOR}
- DOPPELGANGER=${DOPPELGANGER}
- LOG_LEVEL=${LOG_LEVEL}
- VC_EXTRAS=${VC_EXTRAS:-}
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
Expand All @@ -127,6 +126,7 @@ services:
- --keymanager-allow-origin=*
- --keymanager-token-file=/var/lib/nimbus/api-token.txt
- --suggested-fee-recipient=${FEE_RECIPIENT}
- --log-level=${LOG_LEVEL}
labels:
- metrics.scrape=true
- metrics.path=/metrics
Expand Down
6 changes: 2 additions & 4 deletions nimbus/docker-entrypoint-vc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ for node in ${nodes}; do
__beacon_nodes+=("--beacon-node=${node}")
done

__log_level="--log-level=${LOG_LEVEL^^}"

# Web3signer URL
if [[ "${WEB3SIGNER}" = "true" ]]; then
__w3s_url="--web3-signer-url=${W3S_NODE}"
Expand All @@ -96,9 +94,9 @@ fi
if [[ "${DEFAULT_GRAFFITI}" = "true" ]]; then
# Word splitting is desired for the command line parameters
# shellcheck disable=SC2086
exec "$@" "${__beacon_nodes[@]}" ${__w3s_url} ${__log_level} ${__doppel} ${__mev_boost} ${__mev_factor} ${__att_aggr} ${VC_EXTRAS}
exec "$@" "${__beacon_nodes[@]}" ${__w3s_url} ${__doppel} ${__mev_boost} ${__mev_factor} ${__att_aggr} ${VC_EXTRAS}
else
# Word splitting is desired for the command line parameters
# shellcheck disable=SC2086
exec "$@" "${__beacon_nodes[@]}" ${__w3s_url} "--graffiti=${GRAFFITI}" ${__log_level} ${__doppel} ${__mev_boost} ${__mev_factor} ${__att_aggr} ${VC_EXTRAS}
exec "$@" "${__beacon_nodes[@]}" ${__w3s_url} "--graffiti=${GRAFFITI}" ${__doppel} ${__mev_boost} ${__mev_factor} ${__att_aggr} ${VC_EXTRAS}
fi
6 changes: 2 additions & 4 deletions nimbus/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ else
__doppel="--doppelganger-detection=false"
fi

__log_level="--log-level=${LOG_LEVEL^^}"

case "${NODE_TYPE}" in
archive)
echo "Nimbus archive node without history pruning"
Expand Down Expand Up @@ -191,9 +189,9 @@ done
if [[ "${DEFAULT_GRAFFITI}" = "true" ]]; then
# Word splitting is desired for the command line parameters
# shellcheck disable=SC2086
exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__mev_factor} ${__log_level} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS}
exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__mev_factor} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS}
else
# Word splitting is desired for the command line parameters
# shellcheck disable=SC2086
exec "$@" ${__network} ${__w3s_url} "--graffiti=${GRAFFITI}" ${__mev_boost} ${__mev_factor} ${__log_level} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS}
exec "$@" ${__network} ${__w3s_url} "--graffiti=${GRAFFITI}" ${__mev_boost} ${__mev_factor} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS}
fi
Loading