Skip to content

Commit

Permalink
feat(ci): Add external-node build to Makefile (#3002)
Browse files Browse the repository at this point in the history
## What ❔

Add external-node build to Makefile

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [x] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk_supervisor fmt` and `zk_supervisor
lint`.
  • Loading branch information
artmakh authored Oct 3, 2024
1 parent b7ba428 commit a5ac9c1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 6 additions & 2 deletions docker/Makefile
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
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

0 comments on commit a5ac9c1

Please sign in to comment.