Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(docker): Fix bugs causing docker builds to fail #5

Merged
merged 5 commits into from
May 31, 2024
Merged

fix(docker): Fix bugs causing docker builds to fail #5

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68be441
fix(docker): Fix bugs causing docker builds to fail
epociask May 31, 2024
6ab8d26
fix(docker): Fix bugs causing docker builds to fail - update .gitmodule
epociask May 31, 2024
13aa1d5
fix(docker): Fix bugs causing docker builds to fail - update submodules
epociask May 31, 2024
9915c46
fix(docker): Fix bugs causing docker builds to fail - update submodules
epociask May 31, 2024
7262e1c
fix(docker): Fix bugs causing docker builds to fail - update contract…
epociask May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
[submodule "contracts"]
path = contracts
url = [email protected]:Layr-Labs/nitro-contracts-private.git
branch = develop
branch = epociask--rollup-manager-contract
epociask marked this conversation as resolved.
Show resolved Hide resolved
[submodule "nitro-testnode"]
path = nitro-testnode
url = [email protected]:Layr-Labs/nitro-testnode-private.git
branch = develop
branch = epociask--eigenda-support
[submodule "rust-kzg-bn254"]
path = arbitrator/rust-kzg-bn254
url = https://github.com/afkbyte/rust-kzg-bn254.git
7 changes: 7 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ RUN apt-get install -y clang=1:14.0-55.7~deb12u1 lld=1:14.0-55.7~deb12u1
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.70.0 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
COPY ./Makefile ./
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254
COPY arbitrator/wasm-libraries arbitrator/wasm-libraries

COPY --from=brotli-wasm-export / target/
RUN . ~/.cargo/env && NITRO_BUILD_IGNORE_TIMESTAMPS=1 RUSTFLAGS='-C symbol-mangling-version=v0' make build-wasm-libs

Expand Down Expand Up @@ -94,6 +96,7 @@ COPY ./Makefile ./
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/jit arbitrator/jit
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header

FROM scratch as prover-header-export
Expand All @@ -109,6 +112,8 @@ COPY arbitrator/Cargo.* arbitrator/
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover/Cargo.toml arbitrator/prover/
COPY arbitrator/jit/Cargo.toml arbitrator/jit/
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254

RUN mkdir arbitrator/prover/src arbitrator/jit/src && \
echo "fn test() {}" > arbitrator/jit/src/lib.rs && \
echo "fn test() {}" > arbitrator/prover/src/lib.rs && \
Expand All @@ -117,6 +122,8 @@ RUN mkdir arbitrator/prover/src arbitrator/jit/src && \
COPY ./Makefile ./
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/jit arbitrator/jit
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254

COPY --from=brotli-library-export / target/
RUN touch -a -m arbitrator/prover/src/lib.rs
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-lib
Expand Down
Loading
Loading