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

feat(ci): Add external-node build to Makefile #3002

Merged
merged 5 commits into from
Oct 3, 2024
Merged

feat(ci): Add external-node build to Makefile #3002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cb1296
feat(ci): Add external-node build to Makefile
artmakh Oct 2, 2024
bb24944
Forgot contracts
artmakh Oct 2, 2024
11e8d53
And no keys
artmakh Oct 2, 2024
7e98010
Merge branch 'main' into makefileenbuild
artmakh Oct 3, 2024
e69d0d6
do not start git checkout
artmakh Oct 3, 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
8 changes: 6 additions & 2 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ check-tools: check-nodejs check-yarn check-rust check-sqlx-cli check-docker chec
# Check that contracts are checkout properly
check-contracts:
@if [ ! -d ../contracts/l1-contracts/lib/forge-std/foundry.toml ] || [ -z "$$(ls -A ../contracts/l1-contracts/lib/forge-std/foundry.toml)" ]; then \
echo "l1-contracts git submodule is missing. Please re-download repo with `git clone --recurse-submodules https://github.com/matter-labs/zksync-era.git`"; \
echo "l1-contracts git submodule is missing. Please re-download repo with 'git clone --recurse-submodules https://github.com/matter-labs/zksync-era.git'"; \
exit 1; \
fi

Expand Down Expand Up @@ -93,9 +93,12 @@ build-witness-generator: check-tools prepare-keys
$(DOCKER_BUILD_CMD) --file witness-generator/Dockerfile --load \
--tag witness-generator:$(PROTOCOL_VERSION) $(CONTEXT)

build-external-node: check-tools prepare-contracts
$(DOCKER_BUILD_CMD) --file external-node/Dockerfile --load \
--tag external-node:$(PROTOCOL_VERSION) $(CONTEXT)

# Build all containers
build-all: build-contract-verifier build-server-v2 build-witness-generator build-circuit-prover-gpu cleanup
build-all: build-contract-verifier build-server-v2 build-witness-generator build-circuit-prover-gpu build-external-node cleanup

# Clean generated images
clean-all:
Expand All @@ -104,3 +107,4 @@ clean-all:
docker rmi server-v2:$(PROTOCOL_VERSION) >/dev/null 2>&1
docker rmi prover:$(PROTOCOL_VERSION) >/dev/null 2>&1
docker rmi witness-generator:$(PROTOCOL_VERSION) >/dev/null 2>&1
docker rmi external-node:$(PROTOCOL_VERSION) >/dev/null 2>&1
2 changes: 2 additions & 0 deletions docs/guides/build-docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ contract-verifier:2.0
server-v2:2.0
prover:2.0
witness-generator:2.0
external-node:2.0
```

Alternatively, you may build only needed components - available targets are
Expand All @@ -34,6 +35,7 @@ make -C ./docker build-contract-verifier
make -C ./docker build-server-v2
make -C ./docker build-circuit-prover-gpu
make -C ./docker build-witness-generator
make -C ./docker build-external-node
```

## Building updated images
Expand Down
Loading