Docker CLI Plugins: Use cliPluginsExtraDirs on Windows
#7435
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
Due to an upcoming change to how the plugins will be instaled on Windows, they need to be a directory that does _not_ contain `docker-credential-*`. Therefore, download them into a separate directory instead. Actual usage will be fixed in follow-up commits. Signed-off-by: Mark Yen <[email protected]>
The previous commit downloaded the plugins to a different directory; update the macOS and Linux integration manager to use that directory instead. Windows will be fixed later. We still add symlinks to `~/.rd/bin/` so that if the user runs e.g. `docker-compose` instead of `docker compose`, the executable will still be found. Signed-off-by: Mark Yen <[email protected]>
Instead of copying the docker CLI plugins to `~/.docker/cli-plugins`, set up `~/.docker/config.json` to add the Rancher Desktop docker CLI plugins directory as an extra directory to scan for plugins. On Windows, this appears to take precedence over `~/.docker/cli-plugins`, therefore resolving issues with not updating the plugins. For symmetry, also do the same for WSL distributions. Signed-off-by: Mark Yen <[email protected]>
Now that we ship the plugins in a separate directory, we also need to add that directory to $PATH so that if the user wants to call it directly it can be done. Signed-off-by: Mark Yen <[email protected]>
The plugins have been moved, so we need to provide a different directory if they are called for. This is used to locate `docker-compose` during extension installation. Signed-off-by: Mark Yen <[email protected]>
mook-as
force-pushed
the
docker-cli/extra-plugin-dir
branch
from
a39513c
to
6b38b5a
Compare
jandubois
previously approved these changes
Sep 11, 2024
pkg/rancher-desktop/integrations/__tests__/unixIntegrationManager.spec.ts
Outdated
Show resolved
Hide resolved
| } else if filepath.Dir(target) == binPath { | ||
| // Remove the symlink, ignoring any errors. | ||
| _ = os.Remove(entryPath) | ||
| } else { |
There was a problem hiding this comment.
Should we delete dangling symlinks too?
- Exclude docker credential helpers when checking for docker CLI plugins in moby client - Rename various variables - Other misc fixes Signed-off-by: Mark Yen <[email protected]>
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.
On Windows, we don't have symlinks available. So instead of copying the plugins to
~/.docker/cli-plugins/, add acliPluginsExtraDirsconfig entry instead so we look for them there.On Windows it appears to prefer that (so leaving the old plugins in
~/.docker/cli-pluginsis harmless; on Linux/mac it seems to prefer~/.docker/cli-plugins(which makes no sense to me, but ¯\_(ツ)_/¯)Note that this PR also moves all the plugins to their own directory (instead of
resources/platform/bin), because we don't want to add everything else to the search path.Fixes #7308