From 0b70a6d79796f723901709a2f029b7a0d20b2fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Tue, 11 Jun 2024 13:48:51 +0200 Subject: [PATCH] ci: use go go-1.21 during docker build (#818) feat: use go go-1.21 during docker build --- Dockerfile | 4 ++-- Dockerfile.alltools | 2 +- Dockerfile.mockccc | 2 +- Dockerfile.mockccc.alpine | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 12ab5937b837..4398975c167f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG VERSION="" ARG BUILDNUM="" # 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 @@ -21,7 +21,7 @@ RUN cargo clean RUN cargo build --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 # Get dependencies - will also be cached if we won't change go.mod/go.sum COPY go.mod /go-ethereum/ diff --git a/Dockerfile.alltools b/Dockerfile.alltools index 70ccc39825e9..c317da25fa48 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 93f349529ef4..f2cf376e89e6 100644 --- a/Dockerfile.mockccc +++ b/Dockerfile.mockccc @@ -4,7 +4,7 @@ ARG VERSION="" ARG BUILDNUM="" # 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 # Get dependencies - will also be cached if we won't change go.mod/go.sum COPY go.mod /go-ethereum/ diff --git a/Dockerfile.mockccc.alpine b/Dockerfile.mockccc.alpine index a255bbbf4007..d65776a712a0 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