You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
<!-- Describe what this PR does -->
## Related issues
<!-- Refer to existing GitHub issues here -->
## Type of Change
<!-- Check one that best describes this PR -->
- [ ] **Add** - New feature or capability
- [ ] **Change** - Changes in existing functionality
- [ ] **Fix** - Bug fixes
- [ ] **Remove** - Removed features or deprecated functionality
- [ ] **Internal** - Internal changes (refactoring, tests, docs, etc.)
## Breaking Changes
<!-- If checked, describe the breaking changes and migration steps -->
<!-- Breaking changes are not generally permitted, please discuss on a
GitHub discussion or with the development team if you believe you need
to break a backward compatibility guarantee -->
- [ ] **This PR contains breaking changes**
## Testing
<!-- How was this tested? Check all that apply -->
- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [ ] No testing required (docs, internal refactor, etc.)
## Additional Notes
<!-- Any additional context, deployment notes, or reviewer guidance -->
Copy file name to clipboardExpand all lines: docs/manuals/cargo-via-docker-macos.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,13 +8,13 @@ This guide describes what is in place for running Cargo (build, test, check) via
8
8
9
9
| Item | Location | Purpose |
10
10
|------|----------|--------|
11
-
|**Makefile task: `cargo-docker-minimal`**|`Makefile.toml`| Run Cargo in the minimal image (`nico-build-minimal`: Rust 1.95 + protoc). **Recommended on Mac.** Requires `build-cargo-docker-image-minimal` once. |
11
+
|**Makefile task: `cargo-docker-minimal`**|`Makefile.toml`| Run Cargo in the minimal image (`nico-build-minimal`: Rust 1.96 + protoc). **Recommended on Mac.** Requires `build-cargo-docker-image-minimal` once. |
12
12
|**Makefile task: `build-cargo-docker-image-minimal`**|`Makefile.toml`| Build the minimal image (Rust + protoc only). Quick (~2–5 min). Required once for workspace builds (e.g. `nico-rpc` needs `protoc`). |
13
13
|**Makefile task: `cargo-docker`**|`Makefile.toml`| Run Cargo inside the repo’s full build container (`nico-build-x86_64`). Requires building that image first. |
14
14
|**Makefile task: `build-cargo-docker-image`**|`Makefile.toml`| Build the full Linux build image from `dev/docker/Dockerfile.build-container-x86_64`. Slow on Apple Silicon (45+ min). |
15
15
|**This guide**|`docs/development/cargo-via-docker-macos.md`| How to use the above and when to choose which option. |
16
-
|**Minimal Dockerfile**|`dev/docker/Dockerfile.cargo-docker-minimal`| Rust 1.95 + `protobuf-compiler` + `libprotobuf-dev` (well-known types). Used for `nico-build-minimal`. |
17
-
|**Full build Dockerfile**|`dev/docker/Dockerfile.build-container-x86_64`| Defines the full build image (Rust 1.95, PostgreSQL, protobuf, TSS, etc.). |
16
+
|**Minimal Dockerfile**|`dev/docker/Dockerfile.cargo-docker-minimal`| Rust 1.96 + `protobuf-compiler` + `libprotobuf-dev` (well-known types). Used for `nico-build-minimal`. |
17
+
|**Full build Dockerfile**|`dev/docker/Dockerfile.build-container-x86_64`| Defines the full build image (Rust 1.96, PostgreSQL, protobuf, TSS, etc.). |
18
18
19
19
All commands below are run from the **repository root** unless noted.
20
20
@@ -173,7 +173,7 @@ If you get an error about the `loki` logging plugin, use: `docker-compose -f doc
@@ -248,7 +248,7 @@ Output binaries appear under `target/` in your repo as usual.
248
248
249
249
**When to use:** Day-to-day builds and checks on macOS when you don’t need the full API test stack (PostgreSQL, TSS, etc.).
250
250
251
-
**What it uses:** The image `nico-build-minimal` (Rust 1.95 + `protoc`). You must build it once with `build-cargo-docker-image-minimal` (~2–5 min). The `nico-rpc` crate needs `protoc` and the Google well-known proto files (`libprotobuf-dev`), so the bare `rust:1.95.0-slim-bookworm` image is not enough for workspace builds.
251
+
**What it uses:** The image `nico-build-minimal` (Rust 1.96 + `protoc`). You must build it once with `build-cargo-docker-image-minimal` (~2–5 min). The `nico-rpc` crate needs `protoc` and the Google well-known proto files (`libprotobuf-dev`), so the bare `rust:1.96.0-slim-bookworm` image is not enough for workspace builds.
0 commit comments