Skip to content

Commit

Permalink
Merge pull request #5 from Layr-Labs/epociask--fixed-testnode-builds
Browse files Browse the repository at this point in the history
fix(docker): Fix bugs causing docker builds to fail
  • Loading branch information
epociask authored May 31, 2024
2 parents 332c9e0 + 7262e1c commit 5af7509
Show file tree
Hide file tree
Showing 7 changed files with 246 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
[submodule "contracts"]
path = contracts
url = [email protected]:Layr-Labs/nitro-contracts-private.git
branch = develop
[submodule "nitro-testnode"]
path = nitro-testnode
url = [email protected]:Layr-Labs/nitro-testnode-private.git
branch = develop
[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
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

0 comments on commit 5af7509

Please sign in to comment.