Lodestar fixes, new logging option

JustNotHelpful · Oct 11, 2021 · 189d3e1 · 189d3e1
1 parent d0b2420
commit 189d3e1
Show file tree

Hide file tree

Showing 30 changed files with 241 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -18,4 +18,4 @@ For a quick testnet start, you can install prerequisites and configure eth-docke
 
 # Version
 
-This is eth-docker v1.5.8
+This is eth-docker v1.5.9
diff --git a/besu.yml b/besu.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   execution:
     restart: "${RESTART}"
@@ -24,6 +31,7 @@ services:
       default:
         aliases:
           - eth1
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - /opt/besu/bin/besu

diff --git a/blank-grafana.yml b/blank-grafana.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   prometheus:
     restart: "${RESTART}"
@@ -14,6 +21,7 @@ services:
       - CLIENT=${COMPOSE_FILE}
     expose:
       - 9090/tcp
+    <<: *logging
     entrypoint: choose-config.sh
     command: ["/bin/prometheus", "--storage.tsdb.path=/prometheus", "--web.console.libraries=/usr/share/prometheus/console_libraries", "--web.console.templates=/usr/share/prometheus/consoles"]
     depends_on:
@@ -38,6 +46,7 @@ services:
       - /etc/timezone:/etc/TZ:ro
     expose:
       - 9100/tcp
+    <<: *logging
   grafana:
     restart: "${RESTART}"
     build:
@@ -53,6 +62,7 @@ services:
       - prometheus
     expose:
       - ${GRAFANA_PORT}/tcp
+    <<: *logging
     labels:
       - traefik.enable=true
       - traefik.http.routers.grafana.entrypoints=web,websecure

diff --git a/default.env b/default.env
@@ -35,12 +35,14 @@ CC_HOST=cc
 DDNS_SUBDOMAIN=
 DDNS_PROXY=true
 
-# Teku/LH rapid sync via initial state/checkpoint. Please create an Infura eth2/beacon project first, then replace the {projectid} and {secret} here
-# and use one of these lines instead of the empty one
+# Teku/Lighthouse/Lodestar rapid sync via initial state/checkpoint. For Teku or Lighthouse, please create an Infura
+# eth2/beacon project first, then replace the {projectid} and {secret} here and use one of these lines instead of the empty one
 #TEKU_RAPID_SYNC=--initial-state=https://{projectid}:{secret}@eth2-beacon-${NETWORK}.infura.io/eth/v1/debug/beacon/states/finalized
 #LH_RAPID_SYNC=--checkpoint-sync-url=https://{projectid}:{secret}@eth2-beacon-${NETWORK}.infura.io/
 TEKU_RAPID_SYNC=
 LH_RAPID_SYNC=
+# Set this to true to rapid sync Lodestar
+LS_RAPID_SYNC=false
 
 # Consensus client address. This could be comma-separated for Lighthouse, with Infura as failover,
 # or could just be a remote consensus client URL for Teku, Lighthouse or Prysm "validator only" setups. Not in use for Nimbus.

diff --git a/erigon.yml b/erigon.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   erigon:
     restart: "${RESTART}"
@@ -24,6 +31,7 @@ services:
       default:
         aliases:
           - eth1
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - erigon

diff --git a/geth.yml b/geth.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   execution:
     restart: "${RESTART}"
@@ -24,6 +31,7 @@ services:
       default:
         aliases:
           - eth1
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - geth

diff --git a/lh-base-notz.yml b/lh-base-notz.yml
@@ -1,5 +1,12 @@
 # Version without timezone, for use with Amazon Linux 2 and similar
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   consensus:
     restart: "${RESTART}"
@@ -22,6 +29,7 @@ services:
       default:
         aliases:
           - eth2
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse
@@ -49,6 +57,7 @@ services:
     image: lighthouse:local
     volumes:
       - lhvalidator-data:/var/lib/lighthouse
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse

diff --git a/lh-base.yml b/lh-base.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   consensus:
     restart: "${RESTART}"
@@ -23,6 +30,7 @@ services:
       default:
         aliases:
           - eth2
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse
@@ -52,6 +60,7 @@ services:
       - lhvalidator-data:/var/lib/lighthouse
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse

diff --git a/lh-consensus.yml b/lh-consensus.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   consensus:
     restart: "${RESTART}"
@@ -24,6 +31,7 @@ services:
       default:
         aliases:
           - eth2
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse

diff --git a/lh-grafana.yml b/lh-grafana.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   consensus:
     expose:
@@ -31,6 +38,7 @@ services:
       - 9090/tcp
     entrypoint: choose-config.sh
     command: ["/bin/prometheus", "--storage.tsdb.path=/prometheus", "--web.console.libraries=/usr/share/prometheus/console_libraries", "--web.console.templates=/usr/share/prometheus/consoles"]
+    <<: *logging
     depends_on:
       - consensus
       - validator
@@ -55,6 +63,7 @@ services:
       - /etc/timezone:/etc/TZ:ro
     expose:
       - 9100/tcp
+    <<: *logging
   grafana:
     restart: "${RESTART}"
     build:
@@ -70,6 +79,7 @@ services:
       - prometheus
     expose:
       - ${GRAFANA_PORT}/tcp
+    <<: *logging
     labels:
       - traefik.enable=true
       - traefik.http.routers.grafana.entrypoints=web,websecure

diff --git a/lh-validator-notz.yml b/lh-validator-notz.yml
@@ -1,11 +1,19 @@
 # Version without timezone, for use with Amazon Linux 2 and similar
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   validator:
     restart: "${RESTART}"
     image: lighthouse:local
     volumes:
       - lhvalidator-data:/var/lib/lighthouse
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse

diff --git a/lh-validator.yml b/lh-validator.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   validator:
     restart: "${RESTART}"
@@ -7,6 +14,7 @@ services:
       - lhvalidator-data:/var/lib/lighthouse
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - lighthouse

diff --git a/lodestar-base.yml b/lodestar-base.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   consensus:
     restart: "${RESTART}"
@@ -20,10 +27,11 @@ services:
       - ${LS_PORT}:${LS_PORT}/udp
     expose:
       - 9596/tcp
+    <<: *logging
     entrypoint:
       - node
-      - --max-old-space-size=8192
-      - /usr/app/packages/cli/bin/lodestar
+      - --max-old-space-size=6144
+      - /usr/app/node_modules/.bin/lodestar
       - beacon
       - --rootDir
       - /var/lib/lodestar/consensus
@@ -37,6 +45,8 @@ services:
       - "/ip4/0.0.0.0/tcp/${LS_PORT}"
       - --eth1.providerUrl
       - ${EC_NODE}
+      - --weakSubjectivitySyncLatest
+      - ${LS_RAPID_SYNC}
       - --logLevel
       - ${LOG_LEVEL}
       - --network
@@ -55,6 +65,7 @@ services:
       - lsvalidator-data:/var/lib/lodestar/validators
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    <<: *logging
     entrypoint:
       - node
       - --max-old-space-size=8192

diff --git a/lodestar/Dockerfile.binary b/lodestar/Dockerfile.binary
@@ -41,4 +41,4 @@ RUN adduser \
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/lodestar/validators && chown ${USER}:${USER} /var/lib/lodestar/validators && chmod 700 /var/lib/lodestar/validators
 
-ENTRYPOINT ["node", "--max-old-space-size=8192", "/usr/app/packages/cli/bin/lodestar"]
+ENTRYPOINT ["node", "--max-old-space-size=6144", "/usr/app/node_modules/.bin/lodestar"]
diff --git a/lodestar/Dockerfile.source b/lodestar/Dockerfile.source
@@ -1,4 +1,4 @@
-FROM node:16-alpine as build
+FROM node:14-alpine as build
 
 # Here only to avoid build-time errors
 ARG DOCKER_TAG
@@ -10,15 +10,14 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 
 WORKDIR /usr/app
 
-RUN bash -c "git clone https://github.com/ChainSafe/lodestar.git && cd lodestar && git config advice.detachedHead false && git fetch --all --tags && git checkout ${BUILD_TARGET} && yarn install --non-interactive --frozen-lockfile && node ./scripts/getGitData /usr/app/lodestar/.git-data.json && rm -r .git"
+RUN bash -c "git clone https://github.com/ChainSafe/lodestar.git && cd lodestar && git config advice.detachedHead false && git fetch --all --tags && git checkout ${BUILD_TARGET} && yarn install --non-interactive --frozen-lockfile && yarn build && cd packages && npm install && npm install ./cli"
 
-FROM node:16-alpine
+FROM node:14-alpine
 
 RUN apk update && apk add --no-cache ca-certificates tzdata bash su-exec && rm -rf /var/cache/apk/*
 
 WORKDIR /usr/app
-COPY --from=build /usr/app/lodestar .
-ENV DOCKER_LODESTAR_GIT_DATA_FILEPATH /usr/app/.git-data.json
+COPY --from=build /usr/app/lodestar/ .
 
 # Scripts that handle permissions
 COPY ./validator-import.sh /usr/local/bin/
@@ -54,4 +53,4 @@ RUN adduser \
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/lodestar/validators && chown ${USER}:${USER} /var/lib/lodestar/validators && chmod 700 /var/lib/lodestar/validators
 
-ENTRYPOINT ["node", "--max-old-space-size=8192", "/usr/app/packages/cli/bin/lodestar"]
+ENTRYPOINT ["node", "--max-old-space-size=6144", "/usr/app/node_modules/.bin/lodestar"]
diff --git a/nimbus-base.yml b/nimbus-base.yml
@@ -1,4 +1,11 @@
 version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
 services:
   consensus:
     restart: "${RESTART}"
@@ -21,6 +28,7 @@ services:
       default:
         aliases:
           - eth2
+    <<: *logging
     entrypoint:
       - docker-entrypoint.sh
       - /usr/local/bin/nimbus_beacon_node
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@ For a quick testnet start, you can install prerequisites and configure eth-docke

		# Version

		This is eth-docker v1.5.8
		This is eth-docker v1.5.9