Skip to content
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

Docker CLI Plugins: Use cliPluginsExtraDirs on Windows #7435

Merged
merged 6 commits into from
Sep 11, 2024

Commits on Sep 9, 2024

  1. Postinstall: download docker CLI plugins to their own directory

    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]>
    mook-as committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a032ba1 View commit details
    Browse the repository at this point in the history
  2. Integrations: Update macOS/Linux docker CLI plugins path

    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]>
    mook-as committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    114de7f View commit details
    Browse the repository at this point in the history
  3. Integrations: Windows: Update docker CLI plugins

    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]>
    mook-as committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    227eec9 View commit details
    Browse the repository at this point in the history
  4. WiX: Add docker-cli-plugins to PATH

    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]>
    mook-as committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    3900234 View commit details
    Browse the repository at this point in the history
  5. MobyClient: Resolve docker CLI plugins

    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 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    6b38b5a View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Address review comments

    - 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]>
    mook-as committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    6301957 View commit details
    Browse the repository at this point in the history