github/ere
1
1
Fork 0
mirror of https://github.com/eth-act/ere.git synced 2026-04-03 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update SP1 to v6.0.0 (#294)

Browse Source
This commit is contained in:
Han
2026-02-17 22:16:33 +09:00
committed by GitHub
parent ffc0e230cf
commit e7ed714394
31 changed files with 2285 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docker/sp1/Dockerfile.base
View File

@@ -2,7 +2,14 @@ ARG BASE_IMAGE=ere-base:latest
FROM $BASE_IMAGE
ARG USERNAME=ere_user
# Install the well known proto files.
RUN apt-get update && apt-get install -y --no-install-recommends \
libprotobuf-dev \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Set default toolchain to 1.91.1 and uninstall the original one.
RUN rustup default 1.91.1 && \
rustup toolchain list | grep -v default | xargs -r rustup toolchain uninstall
# Copy the SP1 SDK installer script
COPY --chmod=755 scripts/sdk_installers/install_sp1_sdk.sh /tmp/install_sp1_sdk.sh
@@ -10,7 +17,7 @@ COPY --chmod=755 scripts/sdk_installers/install_sp1_sdk.sh /tmp/install_sp1_sdk.
# Define where SP1 SDK will be installed within the image.
# The install_sp1_sdk.sh script will respect these ENV variables.
ENV SP1_DIR="/root/.sp1" \
SP1_VERSION="v5.2.4"
SP1_VERSION="v6.0.0"
# Run the SP1 SDK installation script
# It will use the SP1_DIR and SP1_VERSION defined above.
@@ -26,7 +33,4 @@ RUN cargo prove --version
# Add Docker CLI
COPY --from=docker:cli /usr/local/bin/docker /usr/local/bin/docker
# TODO: Maybe we use root to install it in ere_user and then switch back to ere_user for security
# USER ${USERNAME} # Switch to non-root user again
CMD ["/bin/bash"]

11
docker/sp1/Dockerfile.server
View File

@@ -1,5 +1,9 @@
ARG BASE_ZKVM_IMAGE=ere-base-sp1:latest
ARG RUNTIME_IMAGE=ubuntu:24.04
ARG RUNTIME_CUDA_IMAGE=nvidia/cuda:12.9.1-runtime-ubuntu24.04
# Whether to enable CUDA feature or not.
ARG CUDA
FROM $BASE_ZKVM_IMAGE AS build_stage
@@ -7,13 +11,16 @@ COPY . /ere
WORKDIR /ere
ARG CUDA
ARG RUSTFLAGS
RUN cargo build --release --package ere-server --bin ere-server --features sp1 \
RUN cargo build --release --package ere-server --bin ere-server --features sp1${CUDA:+,cuda} \
&& mkdir bin && mv target/release/ere-server bin/ere-server \
&& cargo clean && rm -rf $CARGO_HOME/registry/
FROM $RUNTIME_IMAGE AS runtime_stage
FROM $RUNTIME_IMAGE AS runtime
FROM $RUNTIME_CUDA_IMAGE AS runtime_cuda
FROM runtime${CUDA:+_cuda} AS runtime_stage
# Add Docker CLI
COPY --from=docker:cli /usr/local/bin/docker /usr/local/bin/docker