Skip to content

Commit a7c9f1e

Browse files
authored
Merge pull request OffchainLabs#3332 from OffchainLabs/fix-docker
Fix the Docker build for contracts-local
2 parents abb0111 + 01478bc commit a7c9f1e

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ COPY --from=brotli-library-builder /workspace/install/ /
2727
FROM node:18-bookworm-slim AS contracts-builder
2828
RUN apt-get update && \
2929
apt-get install -y git python3 make g++ curl
30-
RUN curl -L https://foundry.paradigm.xyz | bash && . ~/.bashrc && ~/.foundry/bin/foundryup -i 1.0.0
30+
RUN curl -L https://foundry.paradigm.xyz | bash && . ~/.bashrc && ~/.foundry/bin/foundryup -i 1.2.3
3131
WORKDIR /workspace
3232
COPY contracts-legacy/package.json contracts-legacy/yarn.lock contracts-legacy/
3333
RUN cd contracts-legacy && yarn install
3434
COPY contracts/package.json contracts/yarn.lock contracts/
3535
RUN cd contracts && yarn install
3636
COPY contracts-legacy contracts-legacy/
37+
COPY contracts-local contracts-local/
3738
COPY contracts contracts/
3839
COPY safe-smart-account safe-smart-account/
3940
RUN cd safe-smart-account && yarn install
@@ -91,6 +92,9 @@ COPY ./wavmio ./wavmio
9192
COPY ./zeroheavy ./zeroheavy
9293
COPY ./contracts-legacy/package.json ./contracts-legacy/yarn.lock ./contracts-legacy/
9394
COPY ./contracts-legacy/src/precompiles/ ./contracts-legacy/src/precompiles/
95+
COPY ./contracts-local/src/precompiles/ ./contracts-local/src/precompiles/
96+
COPY ./contracts-local/gas-dimensions/ ./contracts-local/gas-dimensions/
97+
COPY ./contracts-local/lib/ ./contracts-local/lib/
9498
COPY ./contracts/src/precompiles/ ./contracts/src/precompiles/
9599
COPY ./contracts/package.json ./contracts/yarn.lock ./contracts/
96100
COPY ./safe-smart-account ./safe-smart-account
@@ -202,6 +206,7 @@ COPY ./arbitrator ./arbitrator
202206
COPY ./solgen ./solgen
203207
COPY ./contracts ./contracts
204208
COPY ./contracts-legacy ./contracts-legacy
209+
COPY ./contracts-local ./contracts-local
205210
COPY ./safe-smart-account ./safe-smart-account
206211
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-replay-env
207212

@@ -257,6 +262,7 @@ COPY --from=contracts-builder workspace/contracts/out/ contracts/out/
257262
COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/
258263
COPY --from=contracts-builder workspace/contracts-legacy/build/ contracts-legacy/build/
259264
COPY --from=contracts-builder workspace/contracts-legacy/out/ contracts-legacy/out/
265+
COPY --from=contracts-builder workspace/contracts-local/out/ contracts-local/out/
260266
COPY --from=contracts-builder workspace/safe-smart-account/build/ safe-smart-account/build/
261267
COPY --from=contracts-builder workspace/.make/ .make/
262268
COPY --from=prover-header-export / target/

contracts-local/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: build build-forge build-forge-sol build-forge-gas-dimensions build-forge-gas-dimensions-yul
22

33
install:
4-
forge install
4+
forge install --no-git
55

66
build: build-forge
77

0 commit comments

Comments
 (0)