From edc2e0756c4f0bc0917a37920c2c7ad783aa73ed Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 2 May 2024 19:00:52 +0000 Subject: [PATCH] Rename cerc-fixturenet-eth-genesis cerc-fixturenet-eth-genesis-premerge (#6) Reviewed-on: https://git.vdb.to/cerc-io/fixturenet-eth-stacks/pulls/6 Co-authored-by: Thomas E Lackey Co-committed-by: Thomas E Lackey --- .../Dockerfile | 0 .../cerc-fixturenet-eth-genesis-premerge/build.sh | 8 ++++++++ .../genesis/Makefile | 0 .../genesis/accounts/import_keys.sh | 0 .../genesis/accounts/mnemonic_to_csv.py | 0 .../genesis/el/build_el.sh | 0 .../genesis/el/el-config.yaml | 0 .../container-build/cerc-fixturenet-eth-genesis/build.sh | 8 -------- .../container-build/cerc-fixturenet-eth-geth/Dockerfile | 2 +- .../cerc-fixturenet-eth-lighthouse/Dockerfile | 2 +- stack-orchestrator/stacks/fixturenet-eth/stack.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename stack-orchestrator/container-build/{cerc-fixturenet-eth-genesis => cerc-fixturenet-eth-genesis-premerge}/Dockerfile (100%) create mode 100755 stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/build.sh rename stack-orchestrator/container-build/{cerc-fixturenet-eth-genesis => cerc-fixturenet-eth-genesis-premerge}/genesis/Makefile (100%) rename stack-orchestrator/container-build/{cerc-fixturenet-eth-genesis => cerc-fixturenet-eth-genesis-premerge}/genesis/accounts/import_keys.sh (100%) rename stack-orchestrator/container-build/{cerc-fixturenet-eth-genesis => cerc-fixturenet-eth-genesis-premerge}/genesis/accounts/mnemonic_to_csv.py (100%) rename stack-orchestrator/container-build/{cerc-fixturenet-eth-genesis => cerc-fixturenet-eth-genesis-premerge}/genesis/el/build_el.sh (100%) rename stack-orchestrator/container-build/{cerc-fixturenet-eth-genesis => cerc-fixturenet-eth-genesis-premerge}/genesis/el/el-config.yaml (100%) delete mode 100755 stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/build.sh diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/Dockerfile b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/Dockerfile similarity index 100% rename from stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/Dockerfile rename to stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/Dockerfile diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/build.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/build.sh new file mode 100755 index 0000000..dac3676 --- /dev/null +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Build cerc/fixturenet-eth-genesis-premerge + +source ${CERC_CONTAINER_BASE_DIR}/build-base.sh + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +docker build -t cerc/fixturenet-eth-genesis-premerge:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/Makefile b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/Makefile similarity index 100% rename from stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/Makefile rename to stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/Makefile diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/import_keys.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/accounts/import_keys.sh similarity index 100% rename from stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/import_keys.sh rename to stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/accounts/import_keys.sh diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/mnemonic_to_csv.py b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/accounts/mnemonic_to_csv.py similarity index 100% rename from stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/accounts/mnemonic_to_csv.py rename to stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/accounts/mnemonic_to_csv.py diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/el/build_el.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/el/build_el.sh similarity index 100% rename from stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/el/build_el.sh rename to stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/el/build_el.sh diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/el/el-config.yaml b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/el/el-config.yaml similarity index 100% rename from stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/genesis/el/el-config.yaml rename to stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/el/el-config.yaml diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/build.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/build.sh deleted file mode 100755 index e2fd112..0000000 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/fixturenet-eth-genesis - -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -docker build -t cerc/fixturenet-eth-genesis:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile index 14b7d07..e904686 100644 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile @@ -1,4 +1,4 @@ -FROM cerc/fixturenet-eth-genesis:local as fnetgen +FROM cerc/fixturenet-eth-genesis-premerge:local as fnetgen FROM ethereum/client-go:release-1.11 as geth # Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile index eb791c6..090c49f 100644 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile @@ -1,6 +1,6 @@ FROM cerc/lighthouse-cli:local AS lcli FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen -FROM cerc/fixturenet-eth-genesis:local AS fnetgen +FROM cerc/fixturenet-eth-genesis-premerge:local AS fnetgen FROM cerc/lighthouse:local diff --git a/stack-orchestrator/stacks/fixturenet-eth/stack.yml b/stack-orchestrator/stacks/fixturenet-eth/stack.yml index 14ee73e..e26b3b9 100644 --- a/stack-orchestrator/stacks/fixturenet-eth/stack.yml +++ b/stack-orchestrator/stacks/fixturenet-eth/stack.yml @@ -6,7 +6,7 @@ repos: containers: - cerc/lighthouse - cerc/lighthouse-cli - - cerc/fixturenet-eth-genesis + - cerc/fixturenet-eth-genesis-premerge - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse pods: