Skip to content

fix(docker): propagate discovered CLI path - #1245

Merged
skevetter merged 2 commits into
mainfrom
fix/rancher-desktop-docker-path
Sep 19, 2026
Merged

skevetter merged 2 commits into
mainfrom
fix/rancher-desktop-docker-path

Conversation

@skevetter

@skevetter skevetter commented Sep 19, 2026

Copy link
Copy Markdown
Contributor

Plan

  • propagate the Docker CLI path resolved by macOS discovery when the provider supplied no path or its default bare docker
  • preserve explicit custom DOCKER_PATH values
  • cover both default-path propagation and custom-path preservation with focused regression tests

Why

The Rancher Desktop discovery added in #1229 found $HOME/.rd/bin/docker, but waitForDocker discarded it because the Docker provider had already populated Agent.Docker.Path with docker. Downstream devcontainer preflight therefore still looked up bare docker on PATH.

Checks

  • go test ./cmd/internal/agentworkspace -run '^TestWaitForDocker' -count=1
  • go test ./cmd/internal/agentworkspace -count=1

The broader all-package compile-only check was attempted twice. It exceeded the local 110-second run window while compiling/downloading dependencies and reported no code failure before timeout.

Handoff note

This draft uses GitHub web commits so the branch contents are reviewable now. Per the project workflow, Samuel will replace/sign the commits before merge. Do not treat the PR as fully green or merge-ready until commit signing is resolved.

Context: discussion #1228, especially the latest Rancher Desktop report.

Summary by CodeRabbit

  • Bug Fixes
    • Resolved Docker paths now correctly replace unset configurations or the default Docker path.
    • Explicitly configured custom Docker paths are preserved.
    • Docker discovery errors are now properly reported.

Signed-off-by: Samuel K <skevetter@pm.me>
Signed-off-by: Samuel K <skevetter@pm.me>
@coderabbitai

coderabbitai Bot commented Sep 19, 2026

Copy link
Copy Markdown

Review Change StackReview Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: cf1058e4-d316-44d9-9fe8-39ca2c6d355b

📥 Commits

Reviewing files that changed from the base of the PR and between 3869ad1 and 0dcc66e.

📒 Files selected for processing (2)
  • cmd/internal/agentworkspace/up.go
  • cmd/internal/agentworkspace/up_test.go

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.


📝 Walkthrough

Walkthrough

waitForDocker now replaces empty or default "docker" paths with the resolved Docker path. It preserves explicitly configured paths. New tests cover both path behaviors and discovery error propagation.

Changes

Docker path resolution

Layer / File(s) Summary
Update and validate Docker path resolution
cmd/internal/agentworkspace/up.go, cmd/internal/agentworkspace/up_test.go
waitForDocker updates empty or "docker" paths, preserves custom paths, and propagates discovery errors. Tests cover each behavior.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 3 functions across 2 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: propagating the discovered Docker CLI path.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
  • Fix all pre-merge checks with AI
✨ Finishing Touches
✨ Simplify code
  • Commit to this branch
  • Create a new PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@netlify

netlify Bot commented Sep 19, 2026

Copy link
Copy Markdown

Deploy Preview for images-devsy-sh canceled.

Name Link
🔨 Latest commit 0dcc66e
🔍 Latest deploy log https://app.netlify.com/projects/images-devsy-sh/deploys/6aaee3f83851a7000886e72e

@netlify

netlify Bot commented Sep 19, 2026

Copy link
Copy Markdown

Deploy Preview for devsydev canceled.

Name Link
🔨 Latest commit 0dcc66e
🔍 Latest deploy log https://app.netlify.com/projects/devsydev/deploys/6aaee3f81f0dd1000902789a

@skevetter
skevetter marked this pull request as ready for review September 19, 2026 20:33
@mergify

mergify Bot commented Sep 19, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@skevetter
skevetter merged commit d12223d into main Sep 19, 2026
86 checks passed
@skevetter
skevetter deleted the fix/rancher-desktop-docker-path branch September 19, 2026 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant