diff --git a/Dockerfile b/Dockerfile index 181da6184c..5063229800 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG BUILDNUM="" ARG SCROLL_LIB_PATH=/scroll/lib # Build libzkp dependency -FROM scrolltech/go-rust-builder:go-1.20-rust-nightly-2022-12-10 as chef +FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as chef WORKDIR app FROM chef as planner @@ -23,7 +23,7 @@ RUN cargo build --release RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/ # Build Geth in a stock Go builder container -FROM scrolltech/go-rust-builder:go-1.20-rust-nightly-2022-12-10 as builder +FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder ADD . /go-ethereum diff --git a/Dockerfile.alltools b/Dockerfile.alltools index 3529b98b54..33fbd64ba0 100644 --- a/Dockerfile.alltools +++ b/Dockerfile.alltools @@ -4,7 +4,7 @@ ARG VERSION="" ARG BUILDNUM="" # Build Geth in a stock Go builder container -FROM golang:1.20-alpine as builder +FROM golang:1.21-alpine as builder RUN apk add --no-cache gcc musl-dev linux-headers git diff --git a/Dockerfile.mockccc b/Dockerfile.mockccc index a01c36713d..25d23511fe 100644 --- a/Dockerfile.mockccc +++ b/Dockerfile.mockccc @@ -5,7 +5,7 @@ ARG BUILDNUM="" ARG SCROLL_LIB_PATH=/scroll/lib # Build Geth in a stock Go builder container -FROM scrolltech/go-rust-builder:go-1.20-rust-nightly-2022-12-10 as builder +FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder ADD . /go-ethereum RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth diff --git a/Dockerfile.mockccc.alpine b/Dockerfile.mockccc.alpine index 77dde0b6c4..f42b651ff4 100644 --- a/Dockerfile.mockccc.alpine +++ b/Dockerfile.mockccc.alpine @@ -4,7 +4,7 @@ ARG VERSION="" ARG BUILDNUM="" # Build Geth in a stock Go builder container -FROM golang:1.20-alpine as builder +FROM golang:1.21-alpine as builder RUN apk add --no-cache gcc musl-dev linux-headers git