Upgrade to use latest lighthouse release (#378 )

Former-commit-id: ed4f40118f
Avoid persisting lighthouse bootnode ENR between restarts (#377 )
2023-05-02 13:18:29 +05:30 · 2023-05-02 12:14:48 +05:30
5 changed files with 8 additions and 19 deletions
@@ -64,8 +64,6 @@ services:
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-eth-lighthouse:local
-    volumes:
-      - fixturenet_eth_bootnode_lighthouse_data:/opt/testnet/build/cl

  fixturenet-eth-lighthouse-1:
    hostname: fixturenet-eth-lighthouse-1
@@ -120,6 +118,5 @@ volumes:
  fixturenet_eth_bootnode_geth_data:
  fixturenet_eth_geth_1_data:
  fixturenet_eth_geth_2_data:
-  fixturenet_eth_bootnode_lighthouse_data:
  fixturenet_eth_lighthouse_1_data:
  fixturenet_eth_lighthouse_2_data:
@@ -1,4 +1,4 @@
-FROM sigp/lcli:v3.2.1 AS lcli
+FROM sigp/lcli:v4.1.0 AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-eth-geth:local AS fnetgeth

@@ -21,22 +21,14 @@ if [ ! -f "$DATADIR/bootnode/enr.dat" ]; then
    --udp-port $BOOTNODE_PORT \
    --tcp-port $BOOTNODE_PORT \
    --genesis-fork-version $GENESIS_FORK_VERSION \
-    --output-dir $DATADIR/bootnode-temp
+    --output-dir $DATADIR/bootnode

-  # Output ENR to a temp dir and mv as "lcli generate-bootnode-enr" will not overwrite an empty dir (mounted volume)
-  mkdir -p $DATADIR/bootnode
-  mv $DATADIR/bootnode-temp/* $DATADIR/bootnode
-  rm -r $DATADIR/bootnode-temp
+  bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
+  echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml

-  echo "Generated bootnode enr"
-else
-  echo "Found existing bootnode enr"
+  echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
 fi

-bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
-echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
-echo "Written bootnode enr to $TESTNET_DIR/boot_enr.yaml"
-
 exec lighthouse boot_node \
    --testnet-dir $TESTNET_DIR \
    --port $BOOTNODE_PORT \
@@ -1,4 +1,4 @@
-FROM sigp/lighthouse:v4.0.1-modern
+FROM sigp/lighthouse:v4.1.0-modern

 RUN apt-get update; apt-get install bash netcat curl less jq -y;

@@ -117,8 +117,8 @@ Clear volumes created by this stack:

 ```bash
 # List all relevant volumes
-$ docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_bootnode_lighthouse_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data"
+$ docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data"

 # Remove all the listed volumes
-$ docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_bootnode_lighthouse_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data")
+$ docker volume rm $(docker volume ls -q --filter "name=.*fixturenet_eth_bootnode_geth_data|.*fixturenet_eth_geth_1_data|.*fixturenet_eth_geth_2_data|.*fixturenet_eth_lighthouse_1_data|.*fixturenet_eth_lighthouse_2_data")
 ```
Author	SHA1	Message	Date
prathamesh0	55e7d22e57	Upgrade to use latest lighthouse release (#378 ) Former-commit-id: `ed4f40118f`	2023-05-02 13:18:29 +05:30
prathamesh0	3634a35479	Avoid persisting lighthouse bootnode ENR between restarts (#377 ) Former-commit-id: `cba2345af3`	2023-05-02 12:14:48 +05:30