From 9fdf0a13e935f6f5b2ad5496794bc6e646ea082f Mon Sep 17 00:00:00 2001 From: pablomendezroyo <41727368+pablomendezroyo@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:56:59 +0100 Subject: [PATCH 1/4] Keep v from upstream version According to upstream changelog > Returned prefix "v" to git tag, docker tags. Reason: compatibility with Golang's rules (go.mod) --- erigon/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erigon/Dockerfile b/erigon/Dockerfile index f6725bc..51ccf1a 100644 --- a/erigon/Dockerfile +++ b/erigon/Dockerfile @@ -1,7 +1,6 @@ ARG UPSTREAM_VERSION -# Removes the v prefix from the version -FROM thorax/erigon:${UPSTREAM_VERSION#v} +FROM thorax/erigon:${UPSTREAM_VERSION} ARG NETWORK ARG P2P_PORT @@ -23,4 +22,4 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh RUN apk update && apk add curl && \ chmod +rx /usr/local/bin/entrypoint.sh /etc/profile.d/execution_tools.sh -ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file +ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] From 16fbf2f65d715f56b3479adf7df0b8193306edfd Mon Sep 17 00:00:00 2001 From: pablomendezroyo <41727368+pablomendezroyo@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:00:26 +0100 Subject: [PATCH 2/4] use erigontech/erigon --- erigon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon/Dockerfile b/erigon/Dockerfile index 51ccf1a..cb5fd07 100644 --- a/erigon/Dockerfile +++ b/erigon/Dockerfile @@ -1,6 +1,6 @@ ARG UPSTREAM_VERSION -FROM thorax/erigon:${UPSTREAM_VERSION} +FROM erigontech/erigon:${UPSTREAM_VERSION} ARG NETWORK ARG P2P_PORT From 6a88baf167b47667c8f808e5478a9bf1b82b7d1f Mon Sep 17 00:00:00 2001 From: pablomendezroyo <41727368+pablomendezroyo@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:02:57 +0100 Subject: [PATCH 3/4] use apt instead of apk --- erigon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon/Dockerfile b/erigon/Dockerfile index cb5fd07..c498580 100644 --- a/erigon/Dockerfile +++ b/erigon/Dockerfile @@ -19,7 +19,7 @@ USER root COPY entrypoint.sh /usr/local/bin/entrypoint.sh -RUN apk update && apk add curl && \ +RUN apt-get update && apt-get install curl && \ chmod +rx /usr/local/bin/entrypoint.sh /etc/profile.d/execution_tools.sh ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] From f05691f12c6e27048d765cc0527ed5ff9e1087b8 Mon Sep 17 00:00:00 2001 From: pablomendezroyo <41727368+pablomendezroyo@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:05:55 +0100 Subject: [PATCH 4/4] add flag `-y` --- erigon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon/Dockerfile b/erigon/Dockerfile index c498580..7327d00 100644 --- a/erigon/Dockerfile +++ b/erigon/Dockerfile @@ -19,7 +19,7 @@ USER root COPY entrypoint.sh /usr/local/bin/entrypoint.sh -RUN apt-get update && apt-get install curl && \ +RUN apt-get update && apt-get install -y curl && \ chmod +rx /usr/local/bin/entrypoint.sh /etc/profile.d/execution_tools.sh ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]