Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nimbus-el/Dockerfile-unified.binary
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
gosu \
adduser \
bash \
git \
git-lfs \
curl \
aria2 \
&& gosu nobody true \
Expand Down
2 changes: 2 additions & 0 deletions nimbus-el/Dockerfile-unified.source
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
gosu \
adduser \
bash \
git \
git-lfs \
curl \
aria2 \
&& gosu nobody true \
Expand Down
2 changes: 2 additions & 0 deletions nimbus-el/Dockerfile.binary
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
gosu \
adduser \
bash \
git \
git-lfs \
curl \
aria2 \
&& gosu nobody true \
Expand Down
2 changes: 2 additions & 0 deletions nimbus-el/Dockerfile.source
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
gosu \
adduser \
bash \
git \
git-lfs \
curl \
aria2 \
&& gosu nobody true \
Expand Down
9 changes: 5 additions & 4 deletions nimbus-el/docker-entrypoint-unified.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ case "${CL_NODE_TYPE}" in
;;
esac

# TODO - adjust for CL and EL bootnodes and network, currently not possible bcs both use the same paraneter names
if [[ "${NETWORK}" =~ ^https?:// ]]; then
echo "Custom testnet at ${NETWORK}"
repo=$(awk -F'/tree/' '{print $1}' <<< "${NETWORK}")
Expand All @@ -169,10 +168,12 @@ if [[ "${NETWORK}" =~ ^https?:// ]]; then
echo "${config_dir}" > .git/info/sparse-checkout
git pull origin "${branch}"
fi
bootnodes="$(awk -F'- ' '!/^#/ && NF>1 {print $2}' "/var/lib/nimbus/testnet/${config_dir}/enodes.yaml" | paste -sd ",")"
networkid="$(jq -r '.config.chainId' "/var/lib/nimbus/testnet/${config_dir}/genesis.json")"
el_bootnodes="$(awk -F'- ' '!/^#/ && NF>1 { split($2, a, /[ \t#]/); if (a[1] != "") printf (first++ ? "," : "") a[1] } END { print "" }' "/var/lib/nimbus/testnet/${config_dir}/enodes.yaml")"
cl_bootnodes="$(awk -F'- ' '!/^#/ && NF>1 { split($2, a, /[ \t#]/); if (a[1] != "") printf (first++ ? "," : "") a[1] } END { print "" }' "/var/lib/nimbus/testnet/${config_dir}/bootstrap_nodes.yaml")"
#networkid="$(jq -r '.config.chainId' "/var/lib/nimbus/testnet/${config_dir}/genesis.json")"
set +e
__network="--bootstrap-node=${bootnodes} --network=${networkid} --network=/var/lib/nimbus/testnet/${config_dir}"
__network="--bootstrap-node=${cl_bootnodes} --el-bootstrap-node=${el_bootnodes} --network=/var/lib/nimbus/testnet/${config_dir}"
# --network=${networkid}
else
__network="--network=${NETWORK}"
fi
Expand Down
7 changes: 4 additions & 3 deletions nimbus-el/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,11 @@ if [[ "${NETWORK}" =~ ^https?:// ]]; then
echo "${config_dir}" > .git/info/sparse-checkout
git pull origin "${branch}"
fi
bootnodes="$(awk -F'- ' '!/^#/ && NF>1 {print $2}' "/var/lib/nimbus/testnet/${config_dir}/enodes.yaml" | paste -sd ",")"
networkid="$(jq -r '.config.chainId' "/var/lib/nimbus/testnet/${config_dir}/genesis.json")"
bootnodes="$(awk -F'- ' '!/^#/ && NF>1 { split($2, a, /[ \t#]/); if (a[1] != "") printf (first++ ? "," : "") a[1] } END { print "" }' "/var/lib/nimbus/testnet/${config_dir}/enodes.yaml")"
#networkid="$(jq -r '.config.chainId' "/var/lib/nimbus/testnet/${config_dir}/genesis.json")"
set +e
__network="--bootstrap-node=${bootnodes} --network=${networkid} --custom-network /var/lib/nimbus/testnet/${config_dir}/genesis.json"
__network="--bootstrap-node=${bootnodes} --network=/var/lib/nimbus/testnet/${config_dir}/genesis.json"
# --network=${networkid}
else
__network="--network=${NETWORK}"
fi
Expand Down
Loading