From a64c29ac34b8927bae36f856d1e7dc39bab1c628 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Thu, 27 Jun 2024 20:34:11 +0800 Subject: [PATCH] simplify genesis image --- .../Dockerfile | 20 ++++++------------- .../genesis/Makefile | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile index 59b917a..caabc93 100644 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile @@ -1,23 +1,15 @@ FROM ethpandaops/ethereum-genesis-generator:3.0.0 AS ethgen +# Build genesis config +ADD genesis /opt/genesis +RUN cd /opt/genesis && make genesis-el + FROM golang:1.21-alpine as builder -RUN apk add --no-cache python3 py3-pip make bash envsubst jq gcc - -# Install ethereum-genesis-generator tools -COPY --from=ethgen /apps /apps -RUN cd /apps/el-gen && pip3 install --break-system-packages -r requirements.txt -RUN pip3 install --break-system-packages --upgrade "web3>=v6.15.1" -RUN pip3 install --break-system-packages --upgrade "typing-extensions" - -# Install tool to generate initial block -RUN CGO_ENABLED=0 go install github.com/cerc-io/eth-dump-genblock@v0.2.0 - -# Build genesis config -COPY genesis /opt/genesis -RUN cd /opt/genesis && make genesis-el +COPY --from=ethgen /opt/genesis /opt/genesis # Snag the genesis block info. +RUN CGO_ENABLED=0 go install github.com/cerc-io/eth-dump-genblock@v0.2.0 RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json FROM alpine:latest diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/Makefile b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/Makefile index a1eef57..be5a877 100644 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/Makefile +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/Makefile @@ -6,7 +6,7 @@ genesis: genesis-el .PHONY: genesis-el genesis-el: - cd el; ./build_el.sh + cd el && . /apps/el-gen/.venv/bin/activate && ./build_el.sh .PHONY: clean clean: