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

New Erigon repo and tag #1923

Merged
merged 1 commit into from
Sep 14, 2024
Merged

New Erigon repo and tag #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ BESU_DOCKERFILE=Dockerfile.binary
# SRC build target can be a tag, a branch, or a pr as "pr-ID"
ERIGON_SRC_BUILD_TARGET='$(git describe --tags $(git rev-list --tags --max-count=1))'
ERIGON_SRC_REPO=https://github.com/ledgerwatch/erigon
ERIGON_DOCKER_TAG=v2.60.6
ERIGON_DOCKER_REPO=thorax/erigon
ERIGON_DOCKER_TAG=latest
ERIGON_DOCKER_REPO=erigontech/erigon
ERIGON_DOCKERFILE=Dockerfile.binary

# Nethermind
Expand Down
6 changes: 3 additions & 3 deletions erigon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ services:
args:
- BUILD_TARGET=${ERIGON_SRC_BUILD_TARGET:-'$(git describe --tags $(git rev-list --tags --max-count=1))'}
- SRC_REPO=${ERIGON_SRC_REPO:-https://github.com/ledgerwatch/erigon}
- DOCKER_TAG=${ERIGON_DOCKER_TAG:-stable}
- DOCKER_REPO=${ERIGON_DOCKER_REPO:-thorax/erigon}
- DOCKER_TAG=${ERIGON_DOCKER_TAG:-latest}
- DOCKER_REPO=${ERIGON_DOCKER_REPO:-erigontech/erigon}
stop_grace_period: 5m
image: erigon:local
pull_policy: never
Expand All @@ -27,7 +27,7 @@ services:
- ARCHIVE_NODE=${ARCHIVE_NODE:-}
- NETWORK=${NETWORK}
- IPV6=${IPV6:-false}
- DOCKER_TAG=${ERIGON_DOCKER_TAG:-stable}
- DOCKER_TAG=${ERIGON_DOCKER_TAG:-latest}
- COMPOSE_FILE=${COMPOSE_FILE}
- CL_P2P_PORT=${CL_P2P_PORT:-9000}
- CL_REST_PORT=${CL_REST_PORT:-5052}
Expand Down
4 changes: 2 additions & 2 deletions erigon/Dockerfile.binary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG DOCKER_TAG=stable
ARG DOCKER_REPO=thorax/erigon
ARG DOCKER_TAG=latest
ARG DOCKER_REPO=erigontech/erigon

FROM ${DOCKER_REPO}:${DOCKER_TAG}

Expand Down
12 changes: 8 additions & 4 deletions ethd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,7 @@ __delete_erigon() {
__value=$(sed -n -e "s/^${__var}=\(.*\)/\1/p" "${__env_file}" || true)
# I do mean to match literally
# shellcheck disable=SC2076
# if [[ ! ("${__value}" =~ "v3" || "${__value}" = "latest" || "${__value}" = "stable") ]]; then # No stable yet
if [[ ! ("${__value}" =~ "v3" || "${__value}" = "latest") ]]; then
if [[ ! ("${__value}" =~ "v3" || "${__value}" = "latest" || "${__value}" = "main-latest") ]]; then
return 0
fi

Expand Down Expand Up @@ -1109,8 +1108,11 @@ __env_migrate() {
if [[ "${__var}" = "LH_DOCKER_TAG" && "${__value}" = "latest-modern" ]]; then # LH 5.2 ditched latest-modern
__value="latest"
fi
if [[ "${__var}" = "ERIGON_DOCKER_TAG" && "${__value}" = "stable" ]]; then # Erigon ditched stable
__value="v2.60.6"
if [[ "${__var}" = "ERIGON_DOCKER_TAG" && "${__value}" = "stable" ]]; then # Erigon switched to latest
__value="latest"
fi
if [[ "${__var}" = "ERIGON_DOCKER_REPO" && "${__value}" = "thorax/erigon" ]]; then # Erigon new repo
__value="erigontech/erigon"
fi
sed -i'.original' -e "s~^\(${__var}\s*=\s*\).*$~\1${__value}~" "${__env_file}"
fi
Expand Down Expand Up @@ -2745,6 +2747,7 @@ __query_execution_client() {
EXECUTION_CLIENT=$(whiptail --notags --title "Select execution client" --menu \
"Which execution client do you want to run?" 9 65 2 \
"nethermind.yml" "Nethermind (.NET)" \
"erigon.yml" "Erigon (Go)" \
"NONE" "Custom - Distributed" 3>&1 1>&2 2>&3)
else
EXECUTION_CLIENT=$(whiptail --notags --title "Select execution client" --menu \
Expand All @@ -2758,6 +2761,7 @@ __query_execution_client() {
"Which execution client do you want to run?" 11 65 4 \
"besu.yml" "Besu (Java)" \
"nethermind.yml" "Nethermind (.NET)" \
"erigon.yml" "Erigon (Go)" \
"geth.yml" "Geth (Go)" \
"NONE" "Custom - Distributed" 3>&1 1>&2 2>&3)
elif uname -m | grep -q riscv64; then
Expand Down
Loading