Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1760 from StefanScherer/windows-programfiles-docker-cli-plugins 

Search Windows CLI plugins also in ProgramFiles
This commit is contained in:
Tibor Vass 2019-03-20 14:03:42 -07:00 committed by GitHub
parent fd9d2e2b03 4d3a76d71e
commit 774d78fcb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cli-plugins/manager/manager_windows.go
View File

@ -7,4 +7,5 @@ import (
var defaultSystemPluginDirs = []string{ var defaultSystemPluginDirs = []string{
filepath.Join(os.Getenv("ProgramData"), "Docker", "cli-plugins"), filepath.Join(os.Getenv("ProgramData"), "Docker", "cli-plugins"),
filepath.Join(os.Getenv("ProgramFiles"), "Docker", "cli-plugins"),
} }

3
docs/extend/cli_plugins.md
View File

@ -111,7 +111,8 @@ the `/usr/local/lib` or `/usr/local/libexec` equivalents but packages
should not do so. should not do so.
Plugins distributed on Windows for system wide installation should be Plugins distributed on Windows for system wide installation should be
installed in `%PROGRAMDATA%\Docker\cli-plugins`. installed in either `%ProgramData%\Docker\cli-plugins` or
`%ProgramFiles%\Docker\cli-plugins`.
User's may on all systems install plugins into `~/.docker/cli-plugins`. User's may on all systems install plugins into `~/.docker/cli-plugins`.