cerc-io/stack-orchestrator
12
1
Fork 3
Code Issues 112 Pull Requests 22 Actions Packages Projects Releases 481 Wiki Activity

Add remote debugging support to fixturenet-geth. #113

Merged
telackey merged 3 commits from telackey/dbg into main 2023-01-11 18:54:22 +00:00
Conversation 0 Commits 3 Files Changed 3 +21 -8
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 106cbe33ca - Show all commits

10
app/data/compose/docker-compose-fixturenet-eth.yml
View File

@ -14,6 +14,12 @@ services:
fixturenet-eth-geth-1:
hostname: fixturenet-eth-geth-1
cap_add:
- SYS_PTRACE
environment:
CERC_RUN_STATEDIFF: "detect"
CERC_STATEDIFF_DB_NODE_ID: 1
REMOTE_DEBUG: "true"
env_file:
- ../config/fixturenet-eth/fixturenet-eth.env
image: cerc/fixturenet-eth-geth:local
@ -27,12 +33,10 @@ services:
- fixturenet-eth-bootnode-geth
ports:
- "8545"
- "40000"
fixturenet-eth-geth-2:
hostname: fixturenet-eth-geth-2
environment:
CERC_RUN_STATEDIFF: "detect"
CERC_STATEDIFF_DB_NODE_ID: 2
healthcheck:
test: ["CMD", "nc", "-v", "localhost", "8545"]
interval: 30s

4
app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile
View File

@ -1,8 +1,12 @@
FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
FROM golang:1.18-alpine as delve
RUN go install github.com/go-delve/delve/cmd/dlv@latest
dboreham commented 2023-01-11 18:41:29 +00:00
Review
Copy Link

Not important for this builder base image, but if possible we would like to standardize on Ubuntu base images, not alpine.

Not important for this builder base image, but if possible we would like to standardize on Ubuntu base images, not alpine.
telackey commented 2023-01-11 18:49:29 +00:00
Review
Copy Link

I was deliberately matching it to the version used to build geth: https://github.com/cerc-io/go-ethereum/blob/v1.10.26-statediff-v4/Dockerfile#L7

I was afraid of running into glibc / musl issues if they didn't match.

I was deliberately matching it to the version used to build geth: https://github.com/cerc-io/go-ethereum/blob/v1.10.26-statediff-v4/Dockerfile#L7 I was afraid of running into glibc / musl issues if they didn't match.
telackey commented 2023-01-11 18:49:50 +00:00
Review
Copy Link

Let me add a comment....

Let me add a comment....
FROM cerc/go-ethereum:local
RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client
COPY --from=delve /go/bin/dlv /
COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis
COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
COPY --from=ethgen /apps /apps

15
app/data/container-build/cerc-fixturenet-eth-geth/run-el.sh
View File

@ -9,13 +9,18 @@ cd /opt/testnet/build/el
python3 -m http.server 9898 &
cd $HOME_DIR
if [ "true" == "$RUN_BOOTNODE" ]; then
geth \
START_CMD="geth"
if [ "true" == "$REMOTE_DEBUG" ] && [ -x "/dlv" ]; then
START_CMD="/dlv --listen=:40000 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/geth --continue --"
fi
if [ "true" == "$RUN_BOOTNODE" ]; then
$START_CMD \
--nodekeyhex="${BOOTNODE_KEY}" \
--nodiscover \
--ipcdisable \
--networkid=${NETWORK_ID} \
--netrestrict="${NETRESTRICT}" 2>&1 | tee /var/log/geth_bootnode.log
--netrestrict="${NETRESTRICT}"
else
cd /opt/testnet/accounts
./import_keys.sh
@ -60,7 +65,7 @@ else
--statediff.writing=true"
fi
geth \
$START_CMD \
--bootnodes="${ENODE}" \
--allow-insecure-unlock \
--http \
@ -80,5 +85,5 @@ else
--mine \
--miner.threads=1 \
--verbosity=5 \
--miner.etherbase="${ETHERBASE}" ${STATEDIFF_OPTS} 2>&1 | tee /var/log/geth.log
--miner.etherbase="${ETHERBASE}" ${STATEDIFF_OPTS}
fi