Skip to content

Conversation

antoineco
Copy link
Contributor

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.

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.
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a 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

@chetgurevitch
Copy link

Fixes docker desktop integration on my system 👍

@nzbr
Copy link
Member

nzbr commented Sep 20, 2024

Seems to work just fine on stable. Amazing work, thank you!

@nzbr nzbr merged commit cc84991 into nix-community:main Sep 20, 2024
24 checks passed
@antoineco antoineco deleted the fix/docker-desktop branch September 20, 2024 23:49
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
@nzbr nzbr added the enhancement New feature or request label Feb 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docker Desktop Integration fails (nativeSystemd)
4 participants