diff --git a/geth/Dockerfile b/geth/Dockerfile index e70ac141..30d4f1e5 100644 --- a/geth/Dockerfile +++ b/geth/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.21 AS op +FROM golang:1.22 AS op WORKDIR /app ENV REPO=https://github.com/ethereum-optimism/optimism.git -ENV VERSION=v1.9.1 -ENV COMMIT=4797ddb70e05d4952685bad53e608cb5606284e6 +ENV VERSION=v1.9.4 +ENV COMMIT=2c24e652161187f3e30045eac1e176e6b53c469d RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' @@ -12,13 +12,13 @@ RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ RUN cd op-node && \ make VERSION=$VERSION op-node -FROM golang:1.21 AS geth +FROM golang:1.22 AS geth WORKDIR /app ENV REPO=https://github.com/ethereum-optimism/op-geth.git -ENV VERSION=v1.101408.0 -ENV COMMIT=5c2e75862239c77d2873de1888ba52ee84c83178 +ENV VERSION=v1.101411.0 +ENV COMMIT=d5a96613c22bc46238a21d6c0f805399c26c9d4c RUN git clone $REPO --branch $VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' diff --git a/reth/Dockerfile b/reth/Dockerfile index d81901fc..64948d0b 100644 --- a/reth/Dockerfile +++ b/reth/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.21 AS op +FROM golang:1.22 AS op WORKDIR /app ENV REPO=https://github.com/ethereum-optimism/optimism.git -ENV VERSION=v1.9.1 -ENV COMMIT=4797ddb70e05d4952685bad53e608cb5606284e6 +ENV VERSION=v1.9.4 +ENV COMMIT=2c24e652161187f3e30045eac1e176e6b53c469d RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' @@ -12,7 +12,7 @@ RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ RUN cd op-node && \ make VERSION=$VERSION op-node -FROM rust:1.80 AS reth +FROM rust:1.82 AS reth ARG FEATURES=jemalloc,asm-keccak,optimism @@ -21,10 +21,13 @@ WORKDIR /app RUN apt-get update && apt-get -y upgrade && apt-get install -y git libclang-dev pkg-config curl build-essential ENV REPO=https://github.com/paradigmxyz/reth.git -ENV COMMIT=c228fe15808c3acbf18dc3af1a03ef5cbdcda07a -RUN git clone $REPO . && git checkout $COMMIT +ENV VERSION=v1.1.0 +ENV COMMIT=1ba631ba9581973e7c6cadeea92cfe1802aceb4a +RUN git clone $REPO --branch $VERSION --single-branch . && \ + git switch -c branch-$VERSION && \ + bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' -RUN cargo build --bin op-reth --locked --features $FEATURES --profile maxperf +RUN cargo build --bin op-reth --features $FEATURES --profile maxperf --manifest-path crates/optimism/bin/Cargo.toml FROM ubuntu:22.04