dev_container: Fix various startup issues by zdeneklapes · Pull Request #53170 · zed-industries/zed

zdeneklapes · 2026-04-04T21:16:00Z

Summary

This merge request fixes multiple dev-container startup issues.

It improves Docker Compose path resolution, preserves compose build configuration when generating
feature builds, hardens remote user detection, and fixes Docker inspect parsing for images that omit
Config.Labels. Together, these changes make dev containers more reliable across a wider range of
setups, including plain base images such as debian:bookworm-slim.

Per-Commit Breakdown

43dc3cb devcontainer fixed
This commit contains the main dev-container fixes.
- Fixes Docker Compose dockerfile and build-context resolution, including cases where the Dockerfile lives outside the .devcontainer directory.
- Preserves compose build args, volumes, and additional contexts when Zed generates feature-build overrides.
- Improves remote user resolution by falling back through remoteUser, containerUser, image user, and finally root.
- Fixes Docker chown invocation to use the resolved remote user correctly.
- Updates remote server build logic to use the active rustup toolchain and stable workspace-root binary paths.
- Adds regression coverage for compose configs, remote user fallback, and remote server path
  handling.
0220310 dont require labels
This commit fixes startup for images whose docker inspect output does not include Config.Labels.
- Makes Docker inspect deserialization tolerant of missing Labels.
- Adds a regression test based on a real debian:bookworm-slim inspect payload.
- Prevents dev-container startup from failing with missing field Labels on plain images.

Why These Changes Were Needed

Dev container startup was failing in several valid configurations:

some Docker Compose setups used dockerfiles or build contexts that were not resolved correctly
some images did not provide enough metadata for strict remote-user resolution
some base images omitted Config.Labels entirely, which caused Docker inspect deserialization to fail

These changes make the implementation more tolerant of real-world Docker and Compose outputs while keeping the existing dev-container flow intact.

Release Notes

Fixed dev container startup for Docker Compose setups with non-standard dockerfile/build-context
layouts and for images whose docker inspect output omits Config.Labels

cla-bot · 2026-04-04T21:16:04Z

We require contributors to sign our Contributor License Agreement, and we don't have @zdeneklapes on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

zdeneklapes · 2026-04-05T09:00:32Z

@cla-bot check

cla-bot · 2026-04-05T09:00:37Z

The cla-bot has been summoned, and re-checked this pull request!

antont · 2026-04-14T05:21:41Z

Hey @zdeneklapes thanks for the fixes! I'm just a user here, who encountered similar problems, and I'm now taking the Dockerfile path resolution fixes to use in the build I use for daily work.

However, I extracted the fix to only that problem in a dedicated branch, as I did not have time to check the other things and I don't want to have extra risks. I opened a PR with just the Dockerfile path fix too, #53860

The zed devs will decide what to do with the fixes, I'm just mentioning for info.

@zdeneklapes

…ext (#53860) ## Context When a Docker Compose service specifies `context: ..` and `dockerfile: .devcontainer/Dockerfile`, Zed resolves the dockerfile path relative to the compose file's directory instead of the build context. This produces a doubled path like `.devcontainer/.devcontainer/Dockerfile` which doesn't exist. Per the [Docker Compose spec](https://docs.docker.com/reference/compose-file/build/#dockerfile), the `dockerfile` field is relative to the build context directory. The fix resolves the context directory first (relative to the compose file), then joins the dockerfile path to that. Closes #53473 ## Prior art This fix is extracted from #53170 by @zdeneklapes, which addresses this bug among several other dev container startup issues. This PR isolates the dockerfile path resolution fix into a focused change to make it easier to review and merge independently. Differences from #53170: - **Scope**: Only the dockerfile-relative-to-context fix, not the other fixes (compose build args preservation, remote user fallback, Docker inspect labels, etc.) - **Implementation**: Inline resolution in `dockerfile_location()` rather than separate helper methods - **Absolute path handling**: Handles absolute dockerfile and context paths - **Tests**: Two test cases — compose file inside `.devcontainer/` with `context: ..`, and compose file at project root with `context: .` ## How to Review Single file change in `crates/dev_container/src/devcontainer_manifest.rs`: - **Fix** (line 234-252): Resolve build context relative to compose file directory, then join dockerfile to that, instead of joining dockerfile to `config_directory` directly. Uses `normalize_path` to resolve `..` components. - **Tests**: Two new `FakeDocker` compose config entries and corresponding tests asserting correct resolved paths. ## Self-Review Checklist - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed docker-compose `dockerfile` path being resolved relative to the compose file instead of the build `context` directory. --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

@zdeneklapes

…ext (zed-industries#53860) ## Context When a Docker Compose service specifies `context: ..` and `dockerfile: .devcontainer/Dockerfile`, Zed resolves the dockerfile path relative to the compose file's directory instead of the build context. This produces a doubled path like `.devcontainer/.devcontainer/Dockerfile` which doesn't exist. Per the [Docker Compose spec](https://docs.docker.com/reference/compose-file/build/#dockerfile), the `dockerfile` field is relative to the build context directory. The fix resolves the context directory first (relative to the compose file), then joins the dockerfile path to that. Closes zed-industries#53473 ## Prior art This fix is extracted from zed-industries#53170 by @zdeneklapes, which addresses this bug among several other dev container startup issues. This PR isolates the dockerfile path resolution fix into a focused change to make it easier to review and merge independently. Differences from zed-industries#53170: - **Scope**: Only the dockerfile-relative-to-context fix, not the other fixes (compose build args preservation, remote user fallback, Docker inspect labels, etc.) - **Implementation**: Inline resolution in `dockerfile_location()` rather than separate helper methods - **Absolute path handling**: Handles absolute dockerfile and context paths - **Tests**: Two test cases — compose file inside `.devcontainer/` with `context: ..`, and compose file at project root with `context: .` ## How to Review Single file change in `crates/dev_container/src/devcontainer_manifest.rs`: - **Fix** (line 234-252): Resolve build context relative to compose file directory, then join dockerfile to that, instead of joining dockerfile to `config_directory` directly. Uses `normalize_path` to resolve `..` components. - **Tests**: Two new `FakeDocker` compose config entries and corresponding tests asserting correct resolved paths. ## Self-Review Checklist - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed docker-compose `dockerfile` path being resolved relative to the compose file instead of the build `context` directory. --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

@zdeneklapes

…ext (zed-industries#53860) ## Context When a Docker Compose service specifies `context: ..` and `dockerfile: .devcontainer/Dockerfile`, Zed resolves the dockerfile path relative to the compose file's directory instead of the build context. This produces a doubled path like `.devcontainer/.devcontainer/Dockerfile` which doesn't exist. Per the [Docker Compose spec](https://docs.docker.com/reference/compose-file/build/#dockerfile), the `dockerfile` field is relative to the build context directory. The fix resolves the context directory first (relative to the compose file), then joins the dockerfile path to that. Closes zed-industries#53473 ## Prior art This fix is extracted from zed-industries#53170 by @zdeneklapes, which addresses this bug among several other dev container startup issues. This PR isolates the dockerfile path resolution fix into a focused change to make it easier to review and merge independently. Differences from zed-industries#53170: - **Scope**: Only the dockerfile-relative-to-context fix, not the other fixes (compose build args preservation, remote user fallback, Docker inspect labels, etc.) - **Implementation**: Inline resolution in `dockerfile_location()` rather than separate helper methods - **Absolute path handling**: Handles absolute dockerfile and context paths - **Tests**: Two test cases — compose file inside `.devcontainer/` with `context: ..`, and compose file at project root with `context: .` ## How to Review Single file change in `crates/dev_container/src/devcontainer_manifest.rs`: - **Fix** (line 234-252): Resolve build context relative to compose file directory, then join dockerfile to that, instead of joining dockerfile to `config_directory` directly. Uses `normalize_path` to resolve `..` components. - **Tests**: Two new `FakeDocker` compose config entries and corresponding tests asserting correct resolved paths. ## Self-Review Checklist - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed docker-compose `dockerfile` path being resolved relative to the compose file instead of the build `context` directory. --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

zdeneklapes added 3 commits April 3, 2026 21:58

devcontainer fixed

43dc3cb

dont require labels

0220310

docs

74eca23

zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label Apr 4, 2026

zed-codeowner-coordinator Bot requested review from a team, cole-miller and reflectronic and removed request for a team April 4, 2026 21:16

zed-codeowner-coordinator Bot assigned reflectronic Apr 4, 2026

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Apr 5, 2026

MrSubidubi changed the title ~~Fixes/dev containers~~ dev_container: Fix various startup issues Apr 6, 2026

antont mentioned this pull request Apr 14, 2026

dev_container: Resolve compose dockerfile path relative to build context #53860

Merged

5 tasks

reflectronic assigned KyleBarton and unassigned reflectronic Apr 16, 2026

reflectronic removed their request for review April 16, 2026 19:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

dev_container: Fix various startup issues#53170

dev_container: Fix various startup issues#53170
zdeneklapes wants to merge 3 commits into
zed-industries:mainfrom
zdeneklapes:fixes/dev-containers

zdeneklapes commented Apr 4, 2026

Uh oh!

cla-bot Bot commented Apr 4, 2026

Uh oh!

zdeneklapes commented Apr 5, 2026

Uh oh!

cla-bot Bot commented Apr 5, 2026

Uh oh!

antont commented Apr 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

zdeneklapes commented Apr 4, 2026

Summary

Per-Commit Breakdown

Why These Changes Were Needed

Release Notes

Uh oh!

cla-bot Bot commented Apr 4, 2026

Uh oh!

zdeneklapes commented Apr 5, 2026

Uh oh!

cla-bot Bot commented Apr 5, 2026

Uh oh!

antont commented Apr 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants