fix(bootstrap): auto-detect Docker Desktop socket on macOS#509
Open
Kh4L wants to merge 1 commit intoNVIDIA:mainfrom
Open
fix(bootstrap): auto-detect Docker Desktop socket on macOS#509Kh4L wants to merge 1 commit intoNVIDIA:mainfrom
Kh4L wants to merge 1 commit intoNVIDIA:mainfrom
Conversation
Add ~/Library/Containers/com.docker.docker/Data/docker-cli.sock to the alternative socket probe list. Recent Docker Desktop versions on macOS may not create /var/run/docker.sock, causing gateway start to fail with a misleading connection error. When the default socket is unreachable, check_docker_available() now iterates alternative sockets and connects through the first one that responds to a ping, instead of failing immediately. Closes NVIDIA#443 Signed-off-by: Serge Panev <spanev@nvidia.com>
Collaborator
|
Is this the same as #494? We're already reviewing that one. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
~/Library/Containers/com.docker.docker/Data/docker-cli.sockto the alternative socket probe list incheck_docker_available()/var/run/docker.sock) is unreachable, automatically tries alternative sockets before failingRelated Issue
Closes #443
Changes
crates/openshell-bootstrap/src/docker.rs:find_alternative_sockets()home-relative probestry_alternative_sockets()helper that iterates alternatives and connects through the first responsive onecheck_docker_available()now callstry_alternative_sockets()on both connection failure and ping failure before returning an errorTesting
mise run testpasses/var/run/docker.sock):openshell gateway startconnects via the alternative socketChecklist