mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 05:36:46 +00:00
ci: use go go-1.21 during docker build (#818)
feat: use go go-1.21 during docker build
This commit is contained in:
parent
77f358fe77
commit
42fb4fba66
4 changed files with 5 additions and 5 deletions
|
|
@ -5,7 +5,7 @@ ARG BUILDNUM=""
|
||||||
ARG SCROLL_LIB_PATH=/scroll/lib
|
ARG SCROLL_LIB_PATH=/scroll/lib
|
||||||
|
|
||||||
# Build libzkp dependency
|
# 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
|
WORKDIR app
|
||||||
|
|
||||||
FROM chef as planner
|
FROM chef as planner
|
||||||
|
|
@ -23,7 +23,7 @@ RUN cargo build --release
|
||||||
RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/
|
RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/
|
||||||
|
|
||||||
# Build Geth in a stock Go builder container
|
# 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
|
ADD . /go-ethereum
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ ARG VERSION=""
|
||||||
ARG BUILDNUM=""
|
ARG BUILDNUM=""
|
||||||
|
|
||||||
# Build Geth in a stock Go builder container
|
# 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
|
RUN apk add --no-cache gcc musl-dev linux-headers git
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ ARG BUILDNUM=""
|
||||||
ARG SCROLL_LIB_PATH=/scroll/lib
|
ARG SCROLL_LIB_PATH=/scroll/lib
|
||||||
|
|
||||||
# Build Geth in a stock Go builder container
|
# 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
|
ADD . /go-ethereum
|
||||||
RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth
|
RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ ARG VERSION=""
|
||||||
ARG BUILDNUM=""
|
ARG BUILDNUM=""
|
||||||
|
|
||||||
# Build Geth in a stock Go builder container
|
# 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
|
RUN apk add --no-cache gcc musl-dev linux-headers git
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue