From 685e11ed6f394b065325fb86293db3389d01093a Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 14:27:07 -0600 Subject: [PATCH 1/3] Build lcli locally --- .../cerc-fixturenet-eth-lighthouse/Dockerfile | 2 +- .../cerc-fixturenet-plugeth-lighthouse/Dockerfile | 2 +- app/data/container-build/cerc-lighthouse-cli/build.sh | 7 +++++++ app/data/stacks/fixturenet-eth-loaded/stack.yml | 1 + app/data/stacks/fixturenet-eth-tx/stack.yml | 1 + app/data/stacks/fixturenet-plugeth-tx/stack.yml | 1 + 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 app/data/container-build/cerc-lighthouse-cli/build.sh diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile index 958d2b39..87f9bb60 100644 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile @@ -1,4 +1,4 @@ -FROM sigp/lcli:v4.1.0 AS lcli +FROM cerc/lighthouse-cli:local AS lcli FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen FROM cerc/fixturenet-eth-geth:local AS fnetgeth diff --git a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile index 8701fe2d..ba92294b 100644 --- a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile @@ -1,4 +1,4 @@ -FROM sigp/lcli:v4.1.0 AS lcli +FROM cerc/lighthouse-cli:local AS lcli FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth diff --git a/app/data/container-build/cerc-lighthouse-cli/build.sh b/app/data/container-build/cerc-lighthouse-cli/build.sh new file mode 100755 index 00000000..a1d347cf --- /dev/null +++ b/app/data/container-build/cerc-lighthouse-cli/build.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Build cerc/lighthouse-cli + +source ${CERC_CONTAINER_BASE_DIR}/build-base.sh + +project_dir=${CERC_REPO_BASE_DIR}/lighthouse +docker build -t cerc/lighthouse-cli:local -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir} diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml index 676e95e2..860e3aaf 100644 --- a/app/data/stacks/fixturenet-eth-loaded/stack.yml +++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml @@ -9,6 +9,7 @@ repos: containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/ipld-eth-server diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml index 0281b262..185f813a 100644 --- a/app/data/stacks/fixturenet-eth-tx/stack.yml +++ b/app/data/stacks/fixturenet-eth-tx/stack.yml @@ -8,6 +8,7 @@ repos: containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/tx-spammer diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index 49dea4c5..57d2c7ba 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -6,6 +6,7 @@ repos: - dboreham/foundry containers: - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-plugeth-plugeth - cerc/fixturenet-plugeth-lighthouse - cerc/tx-spammer From c120ee20864469b3551f074ae3aa9bd5e7426b45 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 14:29:07 -0600 Subject: [PATCH 2/3] Pull lighthouse repo --- app/data/stacks/fixturenet-eth-loaded/stack.yml | 1 + app/data/stacks/fixturenet-eth-tx/stack.yml | 3 ++- app/data/stacks/fixturenet-plugeth-tx/stack.yml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml index 860e3aaf..dd7e05fd 100644 --- a/app/data/stacks/fixturenet-eth-loaded/stack.yml +++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml @@ -6,6 +6,7 @@ repos: - github.com/cerc-io/tx-spammer - github.com/cerc-io/ipld-eth-server - github.com/cerc-io/ipld-eth-db + - github.com/cerc-io/lighthouse containers: - cerc/go-ethereum - cerc/lighthouse diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml index 185f813a..35e43575 100644 --- a/app/data/stacks/fixturenet-eth-tx/stack.yml +++ b/app/data/stacks/fixturenet-eth-tx/stack.yml @@ -4,7 +4,8 @@ decription: "Ethereum Fixturenet w/ tx-spammer" repos: - github.com/cerc-io/go-ethereum - github.com/cerc-io/tx-spammer - - dboreham/foundry + - github.com/dboreham/foundry + - github.com/cerc-io/lighthouse containers: - cerc/go-ethereum - cerc/lighthouse diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index 57d2c7ba..e6d8c615 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -3,7 +3,8 @@ name: fixturenet-plugeth-tx decription: "plugeth Ethereum Fixturenet w/ tx-spammer" repos: - github.com/cerc-io/tx-spammer - - dboreham/foundry + - github.com/dboreham/foundry + - github.com/cerc-io/lighthouse containers: - cerc/lighthouse - cerc/lighthouse-cli From 223aacb16ff1b66e5bc7d8616461c2086546dd9a Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 14:30:01 -0600 Subject: [PATCH 3/3] Enable portable lcli build --- app/data/container-build/cerc-lighthouse-cli/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-lighthouse-cli/build.sh b/app/data/container-build/cerc-lighthouse-cli/build.sh index a1d347cf..75719ef4 100755 --- a/app/data/container-build/cerc-lighthouse-cli/build.sh +++ b/app/data/container-build/cerc-lighthouse-cli/build.sh @@ -4,4 +4,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh project_dir=${CERC_REPO_BASE_DIR}/lighthouse -docker build -t cerc/lighthouse-cli:local -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir} +docker build -t cerc/lighthouse-cli:local --build-arg PORTABLE=true -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir}