Merge pull request ethereum#69 from gnosischain/fix/reth-gnosis-client

fix: reth gnosis client docker files

Author: dmitriy-b

clients/go-ethereum-gnosis/Dockerfile

@@ -14,19 +14,19 @@ COPY --from=builder /usr/local/bin/geth /usr/local/bin/geth
 # Generate the version.txt file.
 RUN /usr/local/bin/geth console --exec 'console.log(admin.nodeInfo.name)' --maxpeers=0 --nodiscover --dev 2>/dev/null | head -1 > /version.txt
 
+# Add the default genesis file and genesis mapper script.
+ADD genesis.json /genesis.json
+ADD mapper.jq /mapper.jq
+
 # Inject the startup script.
 ADD geth.sh /geth.sh
-ADD mapper.jq /mapper.jq
 RUN chmod +x /geth.sh
 
 # Inject the enode id retriever script.
 RUN mkdir /hive-bin
 ADD enode.sh /hive-bin/enode.sh
 RUN chmod +x /hive-bin/enode.sh
 
-# Add a default genesis file.
-ADD genesis.json /genesis.json
-
 # Export the usual networking ports to allow outside access to the node
 EXPOSE 8545 8546 8547 8551 30303 30303/udp
 

clients/go-ethereum-gnosis/Dockerfile.git

@@ -2,7 +2,7 @@
 
 FROM golang:1.23-alpine AS builder
 ARG github=gnosischain/go-ethereum
-ARG tag=latest
+ARG tag=master
 
 # Install dependencies
 RUN \
@@ -24,19 +24,19 @@ COPY --from=builder /usr/local/bin/geth /usr/local/bin/geth
 # Generate the version.txt file.
 RUN /usr/local/bin/geth console --exec 'console.log(admin.nodeInfo.name)' --maxpeers=0 --nodiscover --dev 2>/dev/null | head -1 > /version.txt
 
+# Add the default genesis file and genesis mapper script.
+ADD genesis.json /genesis.json
+ADD mapper.jq /mapper.jq
+
 # Inject the startup script.
 ADD geth.sh /geth.sh
-ADD mapper.jq /mapper.jq
 RUN chmod +x /geth.sh
 
 # Inject the enode id retriever script.
 RUN mkdir /hive-bin
 ADD enode.sh /hive-bin/enode.sh
 RUN chmod +x /hive-bin/enode.sh
 
-# Add a default genesis file.
-ADD genesis.json /genesis.json
-
 # Export the usual networking ports to allow outside access to the node
 EXPOSE 8545 8546 8547 8551 30303 30303/udp
 

clients/go-ethereum-gnosis/Dockerfile.local

@@ -2,11 +2,11 @@
 
 FROM golang:1-alpine AS builder
 
-# Default local client path: clients/go-ethereum-gnosis/<go-ethereum-gnosis>
-ARG local_path=go-ethereum-gnosis
-COPY $local_path go-ethereum-gnosis
+# Default local client path: clients/go-ethereum-gnosis/<go-ethereum>
+ARG local_path=go-ethereum
+COPY $local_path /go-ethereum
+WORKDIR /go-ethereum
 
-WORKDIR /go-ethereum-gnosis
 RUN apk add --update bash curl jq git make gcc libc-dev linux-headers
 RUN make geth
 RUN mv ./build/bin/geth /usr/local/bin/geth
@@ -18,19 +18,19 @@ COPY --from=builder /usr/local/bin/geth /usr/local/bin/geth
 # Generate the version.txt file.
 RUN /usr/local/bin/geth console --exec 'console.log(admin.nodeInfo.name)' --maxpeers=0 --nodiscover --dev 2>/dev/null | head -1 > /version.txt
 
+# Add the default genesis file and genesis mapper script.
+ADD genesis.json /genesis.json
+ADD mapper.jq /mapper.jq
+
 # Inject the startup script.
 ADD geth.sh /geth.sh
-ADD mapper.jq /mapper.jq
 RUN chmod +x /geth.sh
 
 # Inject the enode id retriever script.
 RUN mkdir /hive-bin
 ADD enode.sh /hive-bin/enode.sh
 RUN chmod +x /hive-bin/enode.sh
 
-# Add a default genesis file.
-ADD genesis.json /genesis.json
-
 # Export the usual networking ports to allow outside access to the node
 EXPOSE 8545 8546 8547 8551 30303 30303/udp
 

clients/nethermind-gnosis/Dockerfile.local

@@ -36,5 +36,5 @@ RUN chmod +x /nethermind.sh /hive-bin/enode.sh
 # Expose networking ports
 EXPOSE 8545 30303 30303/udp
 
-ENV NETHERMIND_HIVE_ENABLED true
+ENV NETHERMIND_HIVE_ENABLED=true
 ENTRYPOINT ["/nethermind.sh"]

clients/reth-gnosis/Dockerfile

@@ -1,25 +1,26 @@
 ARG baseimage=ghcr.io/gnosischain/reth_gnosis
-ARG tag=master
+ARG tag=latest
 
-FROM $baseimage:$tag as builder
+# Build the reth-gnosis binary
+FROM $baseimage:$tag AS builder
 ARG GOPROXY
-
 ENV GOPROXY=${GOPROXY}
 
 # Install script tools.
 RUN apt-get update -y
 RUN apt-get install -y bash curl jq
 
-# Add genesis mapper script.
-ADD genesis.json /genesis.json
-ADD mapper.jq /mapper.jq
+# Add default genesis file and genesis mapper script.
+COPY genesis.json /genesis.json
+COPY mapper.jq /mapper.jq
 
 # Add the startup script.
-ADD reth.sh /reth.sh
+COPY reth.sh /reth.sh
 RUN chmod +x /reth.sh
 
 # Add the enode URL retriever script.
-ADD enode.sh /hive-bin/enode.sh
+RUN mkdir /hive-bin
+COPY enode.sh /hive-bin/enode.sh
 RUN chmod +x /hive-bin/enode.sh
 
 # Create version.txt

clients/reth-gnosis/Dockerfile.git

@@ -1,17 +1,14 @@
-
-### Build Reth From Git:
-## Pulls reth from a git repository and builds it from source.
+# Pulls reth gnosis from a git repository and builds it from source.
 
 ## Builder stage: Compiles reth from a git repository
-FROM rust:latest as builder
-
-ARG github=paradigmxyz/reth
-ARG tag=main
+FROM rust:latest AS builder
+ARG github=gnosischain/reth_gnosis
+ARG tag=master
 
 RUN apt-get update && apt-get install -y libclang-dev pkg-config build-essential \
     && echo "Cloning: $github - $tag" \
-    && git clone --depth 1 --branch $tag https://github.com/$github reth \
-    && cd reth && cargo build --release \
+    && git clone --depth 1 --branch $tag https://github.com/$github reth_gnosis \
+    && cd reth_gnosis && cargo build --release \
     && cp target/release/reth /usr/local/bin/reth
 
 ## Final stage: Sets up the environment for running reth
@@ -22,17 +19,21 @@ RUN apt-get update && apt-get install -y bash curl jq \
 # Copy compiled binary from builder
 COPY --from=builder /usr/local/bin/reth /usr/local/bin/reth
 
-# Add genesis mapper script, startup script, and enode URL retriever script
+# Add default genesis file and genesis mapper script.
 COPY genesis.json /genesis.json
 COPY mapper.jq /mapper.jq
+
+# Inject the startup script.
 COPY reth.sh /reth.sh
-COPY enode.sh /hive-bin/enode.sh
+RUN chmod +x /reth.sh
 
-# Set execute permissions for scripts
-RUN chmod +x /reth.sh /hive-bin/enode.sh
+# Inject the enode id retriever script.
+RUN mkdir /hive-bin
+COPY enode.sh /hive-bin/enode.sh
+RUN chmod +x /hive-bin/enode.sh
 
 # Create version.txt
-RUN /usr/local/bin/reth --version | head -1 > /version.txt
+RUN /usr/local/bin/reth --version | sed -e 's/reth \(.*\)/\1/' > /version.txt
 
 # Export the usual networking ports
 EXPOSE 8545 8546 30303 30303/udp

clients/reth-gnosis/Dockerfile.local

@@ -1,15 +1,14 @@
-### Build Reth Locally:
-## Requires a copy of <reth>/ -> hive/clients/reth/<reth>
+## Build reth gnosis from source from a local directory.
 
 ## Builder stage: Compiles reth from a git repository
-FROM rust:latest as builder
+FROM rust:latest AS builder
 
-# Default local client path: clients/reth/<reth>
-ARG local_path=reth
-COPY $local_path reth
+# Default local client path: clients/reth-gnosis/<reth_gnosis>
+ARG local_path=reth_gnosis
+COPY $local_path /reth_gnosis
 
 RUN apt-get update && apt-get install -y libclang-dev pkg-config build-essential \
-    && cd reth && cargo build --release \
+    && cd /reth_gnosis && cargo build --release \
     && cp target/release/reth /usr/local/bin/reth
 
 ## Final stage: Sets up the environment for running reth
@@ -20,17 +19,21 @@ RUN apt-get update && apt-get install -y bash curl jq \
 # Copy compiled binary from builder
 COPY --from=builder /usr/local/bin/reth /usr/local/bin/reth
 
-# Add genesis mapper script, startup script, and enode URL retriever script
+# Add default genesis file and genesis mapper script
 COPY genesis.json /genesis.json
 COPY mapper.jq /mapper.jq
+
+# Inject the startup script.
 COPY reth.sh /reth.sh
-COPY enode.sh /hive-bin/enode.sh
+RUN chmod +x /reth.sh
 
-# Set execute permissions for scripts
-RUN chmod +x /reth.sh /hive-bin/enode.sh
+# Inject the enode id retriever script.
+RUN mkdir /hive-bin
+COPY enode.sh /hive-bin/enode.sh
+RUN chmod +x /hive-bin/enode.sh
 
 # Create version.txt
-RUN /usr/local/bin/reth --version | head -1 > /version.txt
+RUN /usr/local/bin/reth --version | sed -e 's/reth \(.*\)/\1/' > /version.txt
 
 # Export the usual networking ports
 EXPOSE 8545 8546 30303 30303/udp

hive.go

@@ -86,7 +86,7 @@ Otherwise, it looks for files in the $HOME directory:
 			"a single client type may be requested with different branches.\n"+
 			"Example: \"besu_latest,besu_20.10.2\"\n")
 
-		clientTimeout = flag.Duration("client.checktimelimit", 3*time.Minute, "The `timeout` of waiting for clients to open up the RPC port.\n"+
+		clientTimeout = flag.Duration("client.checktimelimit", 10*time.Minute, "The `timeout` of waiting for clients to open up the RPC port.\n"+
 			"If a very long chain is imported, this timeout may need to be quite large.\n"+
 			"A lower value means that hive won't wait as long in case the node crashes and\n"+
 			"never opens the RPC port.")