github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-04-23 03:00:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-bridge-history-api-write-db

Browse Source
This commit is contained in:
colinlyguo
2023-12-13 15:15:13 +08:00
parent 1d358fa4ed 7dd1b05f46
commit b534aed080
40 changed files with 722 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/dockerfiles/coordinator-api.Dockerfile
View File

@@ -1,5 +1,5 @@
# Build libzkp dependency
FROM scrolltech/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as chef
FROM scrolltech/go-rust-builder:go-1.20-rust-nightly-2022-12-10 as chef
WORKDIR app
FROM chef as planner
@@ -17,7 +17,7 @@ RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/
# Download Go dependencies
FROM scrolltech/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as base
FROM scrolltech/go-rust-builder:go-1.20-rust-nightly-2022-12-10 as base
WORKDIR /src
COPY go.work* ./
COPY ./rollup/go.* ./rollup/

2
build/dockerfiles/coordinator-cron.Dockerfile
View File

@@ -1,5 +1,5 @@
# Download Go dependencies
FROM scrolltech/go-alpine-builder:1.19 as base
FROM scrolltech/go-alpine-builder:1.20 as base
WORKDIR /src
COPY go.work* ./

2
build/dockerfiles/db_cli.Dockerfile
View File

@@ -1,5 +1,5 @@
# Download Go dependencies
FROM scrolltech/go-alpine-builder:1.19 as base
FROM scrolltech/go-alpine-builder:1.20 as base
WORKDIR /src
COPY go.work* ./

2
build/dockerfiles/event_watcher.Dockerfile
View File

@@ -1,5 +1,5 @@
# Download Go dependencies
FROM scrolltech/go-alpine-builder:1.19 as base
FROM scrolltech/go-alpine-builder:1.20 as base
WORKDIR /src
COPY go.work* ./

2
build/dockerfiles/gas_oracle.Dockerfile
View File

@@ -1,5 +1,5 @@
# Download Go dependencies
FROM scrolltech/go-alpine-builder:1.19 as base
FROM scrolltech/go-alpine-builder:1.20 as base
WORKDIR /src
COPY go.work* ./

2
build/dockerfiles/intermediate/Makefile
View File

@@ -1,5 +1,5 @@
ifeq ($(GO_VERSION),)
GO_VERSION=1.19
GO_VERSION=1.20
endif
ifeq ($(RUST_VERSION),)
RUST_VERSION=nightly-2022-12-10

2
build/dockerfiles/intermediate/cuda-go-rust-builder.Dockerfile
View File

@@ -1,5 +1,5 @@
ARG CUDA_VERSION=11.7.1
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20
ARG RUST_VERSION=nightly-2022-12-10
ARG CARGO_CHEF_TAG=0.1.41

2
build/dockerfiles/intermediate/go-alpine-builder.Dockerfile
View File

@@ -1,4 +1,4 @@
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20
FROM golang:${GO_VERSION}-alpine

2
build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile
View File

@@ -1,4 +1,4 @@
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20
ARG RUST_VERSION=nightly-2022-12-10
ARG CARGO_CHEF_TAG=0.1.41

2
build/dockerfiles/intermediate/go-rust-builder.Dockerfile
View File

@@ -1,4 +1,4 @@
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20
ARG RUST_VERSION=nightly-2022-12-10
ARG CARGO_CHEF_TAG=0.1.41

2
build/dockerfiles/local_testing.Dockerfile
View File

@@ -1,5 +1,5 @@
# Start from the latest golang base image
FROM golang:1.19
FROM golang:1.20
# Install Docker
RUN apt-get update && apt-get install -y docker.io

2
build/dockerfiles/rollup_relayer.Dockerfile
View File

@@ -1,5 +1,5 @@
# Download Go dependencies
FROM scrolltech/go-alpine-builder:1.19 as base
FROM scrolltech/go-alpine-builder:1.20 as base
WORKDIR /src
COPY go.work* ./