diff --git a/README.md b/README.md index 156f5ced..7c937e6e 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,4 @@ If we've helped you out, in-person or by creating this project, a tip will be ve # Version -This is eth-docker v1.4.2 +This is eth-docker v1.4.2.1 diff --git a/default.env b/default.env index 79bf08ab..6b4ea892 100644 --- a/default.env +++ b/default.env @@ -106,8 +106,8 @@ LS_DOCKERFILE=Dockerfile.binary # Erigon ERIGON_SRC_BUILD_TARGET=$(git describe --tags $(git rev-list --tags --max-count=1)) -ERIGON_DOCKER_TAG=latest -ERIGON_DOCKERFILE=Dockerfile.source +ERIGON_DOCKER_TAG=stable +ERIGON_DOCKERFILE=Dockerfile.binary # OpenEthereum OE_SRC_BUILD_TARGET=$(git describe --tags $(git rev-list --tags --max-count=1)) diff --git a/erigon.yml b/erigon.yml index 21356112..7e58ce20 100644 --- a/erigon.yml +++ b/erigon.yml @@ -12,7 +12,7 @@ services: image: erigon:local user: erigon volumes: - - erigon-ec-data:/var/lib/erigon + - erigon-ec-data:/var/lib/erigoni - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -25,13 +25,13 @@ services: - --private.api.addr - 0.0.0.0:9090 - --datadir - - /var/lib/erigon + - /var/lib/erigoni - --port - ${EC_P2P_PORT} - --chain - ${EC_NETWORK} - - --storage-mode - - r + - --prune + - htc execution: restart: "${RESTART}" image: erigon:local diff --git a/erigon/Dockerfile.binary b/erigon/Dockerfile.binary new file mode 100644 index 00000000..3767222a --- /dev/null +++ b/erigon/Dockerfile.binary @@ -0,0 +1,18 @@ +ARG DOCKER_TAG + +FROM thorax/erigon:${DOCKER_TAG} + +# Unused, this is here to avoid build time complaints +ARG BUILD_TARGET + +ARG UID=10001 + +USER root + +RUN apk --no-cache add shadow && groupmod -g "${UID}" erigon && usermod -u "${UID}" -g "${UID}" erigon + +RUN mkdir -p /var/lib/erigoni && chown -R erigon:erigon /var/lib/erigoni + +USER erigon + +ENTRYPOINT ["erigon"] diff --git a/erigon/Dockerfile.source b/erigon/Dockerfile.source index d370f50f..76b1ed7d 100644 --- a/erigon/Dockerfile.source +++ b/erigon/Dockerfile.source @@ -27,7 +27,7 @@ RUN adduser \ --uid "${UID}" \ "${USER}" -RUN mkdir -p /var/lib/erigon && chown ${USER}:${USER} /var/lib/erigon +RUN mkdir -p /var/lib/erigoni && chown ${USER}:${USER} /var/lib/erigoni # Copy executable COPY --from=builder /src/erigon/build/bin/erigon /usr/local/bin/