docker: recognize docker desktop for linux socket location #5823
Conversation
This file contains 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
nicks
approved these changes
May 17, 2022
internal/docker/env.go
Outdated
| host == "unix:///var/run/docker.sock" || | ||
|
|
||
| // Docker Desktop for Linux - socket is in ~/.docker/desktop/docker.sock | ||
| ddLinux.Match([]byte(host)) |
There was a problem hiding this comment.
MatchString would be more idiomatic.
internal/docker/env.go
Outdated
| @@ -284,6 +285,8 @@ func isOldMinikube(ctx context.Context, minikubeClient k8s.MinikubeClient) bool | |||
| return minMinikubeVersionBuildkit.GTE(vParsed) | |||
| } | |||
|
|
|||
| var ddLinux *regexp.Regexp = regexp.MustCompile(`^unix:///home/[^/]+/.docker/desktop/docker.sock$`) | |||
There was a problem hiding this comment.
can we be a bit more permissive here? e.g., unix:///.*/.docker/desktop/docker.sock?
i have definitely worked on unix systems where the home directories did not match this regexp, and the relevant manuals note that we shouldn't be assuming they're laid out this way (cf https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s08.html)
There was a problem hiding this comment.
Yeah, switched to checking prefix unix:// and suffix /.docker/desktop/docker.sock
nicksieger
force-pushed
the
nicksieger/5812
branch
from
eb5d782 to
5be1699
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #5812.