Refactors (#244)

This commit is contained in:
Han
2025-12-12 10:31:11 +09:00
committed by GitHub
parent d15c6b495d
commit e602c1824e
37 changed files with 390 additions and 251 deletions

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-airbender:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-jolt:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \
@@ -29,7 +31,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH
# Copy Jolt SDK
COPY --from=build_stage /root/.jolt /root/.jolt
COPY --from=base_zkvm /root/.jolt /root/.jolt
# Copy ere-compiler
COPY --from=build_stage /ere/bin/ere-compiler /ere/bin/ere-compiler

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-miden:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-nexus:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-openvm:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-pico:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-risc0:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \
@@ -29,7 +31,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH
# Copy Risc0 SDK
COPY --from=build_stage /root/.risc0 /root/.risc0
COPY --from=base_zkvm /root/.risc0 /root/.risc0
# Copy ere-compiler
COPY --from=build_stage /ere/bin/ere-compiler /ere/bin/ere-compiler

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-sp1:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -21,8 +23,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \
@@ -30,7 +32,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH
# Copy SP1 SDK
COPY --from=build_stage /root/.sp1 /root/.sp1
COPY --from=base_zkvm /root/.sp1 /root/.sp1
# Add SP1 SDK to path
ENV PATH=/root/.sp1/bin:$PATH

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-ziren:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -20,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \
@@ -29,7 +31,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH
# Copy Ziren SDK
COPY --from=build_stage /root/.zkm-toolchain /root/.zkm-toolchain
COPY --from=base_zkvm /root/.zkm-toolchain /root/.zkm-toolchain
# Copy ere-compiler
COPY --from=build_stage /ere/bin/ere-compiler /ere/bin/ere-compiler

View File

@@ -1,7 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-zisk:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
FROM $BASE_ZKVM_IMAGE AS build_stage
FROM $BASE_ZKVM_IMAGE AS base_zkvm
FROM base_zkvm AS build_stage
COPY . /ere
@@ -17,11 +19,13 @@ FROM $RUNTIME_IMAGE AS runtime_stage
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
ca-certificates \
nasm \
libgmp-dev \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Copy Rust
COPY --from=build_stage /usr/local/cargo /usr/local/cargo
COPY --from=build_stage /usr/local/rustup /usr/local/rustup
COPY --from=base_zkvm /usr/local/cargo /usr/local/cargo
COPY --from=base_zkvm /usr/local/rustup /usr/local/rustup
# Add Rust to path
ENV RUSTUP_HOME=/usr/local/rustup \
@@ -29,13 +33,13 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH
# Copy TamaGo
COPY --from=build_stage /root/.tamago /root/.tamago
COPY --from=base_zkvm /root/.tamago /root/.tamago
# Add TamaGo to path
ENV PATH=/root/.tamago/bin:$PATH
# Copy ZisK SDK
COPY --from=build_stage /root/.zisk/toolchains /root/.zisk/toolchains
COPY --from=base_zkvm /root/.zisk/toolchains /root/.zisk/toolchains
# Copy ere-compiler
COPY --from=build_stage /ere/bin/ere-compiler /ere/bin/ere-compiler