-
-
Notifications
You must be signed in to change notification settings - Fork 150
Update Docker Desktop integration #545
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
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
Ensures that all executables required by Docker Desktop on Windows exist in the default PATH of the WSL distribution.
Compose links to Docker Desktop by opening 'docker-desktop://' URLs through xdg-open.
Docker Desktop's WSL integration is able to start the proxy by itself and to stop it upon shut down. Keeping a systemd unit under the management of NixOS is not only unnecessary but also comes with its own issues: - We will ultimately have to play catch up with Docker Desktop whenever they change their flags. - The service is running constantly, or worse, fails constantly when the docker-desktop instance is unavailable unless we add some better prerequisite detection to the unit.
Docker Desktop comes with its own 'docker' and CLI plugin executables already, including Compose. Docker Desktop symlinks those executables in the /usr/bin directory of the WSL instance whenever it is up and removes them when it shuts down. If the user wants to install their own 'docker' program they are free to do so, but it is by no means something that Docker Desktop requires.
SuperSandro2000
approved these changes
Sep 16, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't test this right now but LGTM
Fixes docker desktop integration on my system 👍 |
Seems to work just fine on stable. Amazing work, thank you! |
antoineco
added a commit
to antoineco/dotfiles
that referenced
this pull request
Sep 21, 2024
Comes with an updated docker-desktop module that works with modern versions of Docker Desktop[1]. [1]: nix-community/NixOS-WSL#545
antoineco
added a commit
to antoineco/dotfiles
that referenced
this pull request
Sep 21, 2024
Comes with an updated docker-desktop module that works with modern versions of Docker Desktop[1]. [1]: nix-community/NixOS-WSL#545
antoineco
added a commit
to antoineco/dotfiles
that referenced
this pull request
Sep 26, 2024
Comes with an updated docker-desktop module that works with modern versions of Docker Desktop[1]. [1]: nix-community/NixOS-WSL#545
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 #235
Tested extensively with Docker Desktop 4.34 and NixOS 24.05.
Please consider each commit individually during the review. Each of them provides a justification about the changes being performed.