Dockerfile Cleanups, remove local git repos, git repo sha256 checks, smaller image, fix entrypoint naming (#54)

* Remove sh from file names as there is there is already an interpreter, also you dont need to have sh entrypoint with the interpreter

* Cleanup apt lists, only copy the necessary files to run geth

* remove all the excessive git commands

* add sha256 checksum on the repo tarballs

* Use dockerfile:1-labs ADD --checksum option to do checksum verification

* Reintroduce "sh" prefix for windows compatibility

---------

Co-authored-by: Michael de Hoog <michael.dehoog@coinbase.com>

Author: Mitsuwa

Dockerfile

@@ -1,39 +1,39 @@
+# syntax=docker/dockerfile:1-labs
 FROM golang:1.19 as op
 
 WORKDIR /app
 
-ENV REPO=https://github.com/ethereum-optimism/optimism.git
+ENV REPO=https://github.com/ethereum-optimism/optimism
 ENV COMMIT=09d23ee8995b7c318a4469a49276f9453535c6a9
-RUN git init && \
-    git remote add origin $REPO && \
-    git fetch --depth=1 origin $COMMIT && \
-    git reset --hard FETCH_HEAD
+ENV CHECKSUM=593338d48967154182d07920fcaf51d18e8c6adb64485356b059e1a1f82fe941
+ADD --checksum=sha256:$CHECKSUM $REPO/archive/$COMMIT.tar.gz ./
 
-RUN cd op-node && \
+RUN tar -xvf ./$COMMIT.tar.gz --strip-components=1 && \
+    cd op-node && \
     make op-node
 
-
 FROM golang:1.19 as geth
 
 WORKDIR /app
 
-ENV REPO=https://github.com/ethereum-optimism/op-geth.git
+ENV REPO=https://github.com/ethereum-optimism/op-geth
 ENV COMMIT=a84992a3b7c33f038ccc69e761bafeefcd605fd3
-RUN git init && \
-    git remote add origin $REPO && \
-    git fetch --depth=1 origin $COMMIT && \
-    git reset --hard FETCH_HEAD
-
-RUN go run build/ci.go install -static ./cmd/geth
+ENV CHECKSUM=8d97c1292c67afb08c124fc1f6586f92ec127464e04749b80eed709de145df17
+ADD --checksum=sha256:$CHECKSUM $REPO/archive/$COMMIT.tar.gz ./
 
+RUN tar -xvf ./$COMMIT.tar.gz --strip-components=1 && \
+    go run build/ci.go install -static ./cmd/geth
 
 FROM golang:1.19
 
 RUN apt-get update && \
-    apt-get install -y jq curl
+    apt-get install -y jq curl && \
+    rm -rf /var/lib/apt/lists
 
 WORKDIR /app
 
 COPY --from=op /app/op-node/bin/op-node ./
 COPY --from=geth /app/build/bin/geth ./
-COPY . .
+COPY geth-entrypoint .
+COPY op-node-entrypoint .
+COPY goerli ./goerli

README.md

@@ -63,7 +63,7 @@ curl -d '{"id":0,"jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["late
   -H "Content-Type: application/json" http://localhost:8545
 ```
 
-Note: Some L1 nodes (e.g. Erigon) do not support fetching storage proofs. You can work around this by specifying `--l1.trustrpc` when starting op-node (add it in `op-node-entrypoint.sh` and rebuild the docker image with `docker compose build`.) Do not do this unless you fully trust the L1 node provider.
+Note: Some L1 nodes (e.g. Erigon) do not support fetching storage proofs. You can work around this by specifying `--l1.trustrpc` when starting op-node (add it in `op-node-entrypoint` and rebuild the docker image with `docker compose build`.) Do not do this unless you fully trust the L1 node provider.
 
 You can map a local data directory for `op-geth` by adding a volume mapping to the `docker-compose.yaml`:
 

docker-compose.yml

@@ -5,7 +5,7 @@ services:
       - 8545:8545
       - 8546:8546
       - 30303:30303
-    command: [ "sh", "./geth-entrypoint.sh" ]
+    command: [ "sh", "./geth-entrypoint" ]
     environment:
       - OP_GETH_GENESIS_FILE_PATH=goerli/genesis-l2.json
       - OP_GETH_SEQUENCER_HTTP=https://goerli.base.org
@@ -21,7 +21,7 @@ services:
       - 9222:9222
       - 7300:7300 # metrics
       - 6060:6060
-    command: [ "sh", "./op-node-entrypoint.sh" ]
+    command: [ "sh", "./op-node-entrypoint" ]
     environment:
       - OP_NODE_L1_ETH_RPC=https://ethereum-goerli-rpc.allthatnode.com # [recommended] replace with your preferred L1 (ethereum, not Base) node RPC URL
       - OP_NODE_L2_ENGINE_AUTH=/tmp/engine-auth-jwt