Search Windows CLI plugins also in ProgramFiles

StefanScherer · StefanScherer · commit 4d3a76d71e36 · 2019-03-20T11:45:03.000-07:00
Signed-off-by: Stefan Scherer &lt;stefan.scherer@docker.com&gt;
diff --git a/cli-plugins/manager/manager_windows.go b/cli-plugins/manager/manager_windows.go
@@ -7,4 +7,5 @@ import (
 
 var defaultSystemPluginDirs = []string{
 	filepath.Join(os.Getenv("ProgramData"), "Docker", "cli-plugins"),
+	filepath.Join(os.Getenv("ProgramFiles"), "Docker", "cli-plugins"),
 }
diff --git a/docs/extend/cli_plugins.md b/docs/extend/cli_plugins.md
@@ -111,7 +111,8 @@ the `/usr/local/lib` or `/usr/local/libexec` equivalents but packages
 should not do so.
 
 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`.
 

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@ import (`
`7`	`7`
`8`	`8`	`var defaultSystemPluginDirs = []string{`
`9`	`9`	`filepath.Join(os.Getenv("ProgramData"), "Docker", "cli-plugins"),`
	`10`	`+ filepath.Join(os.Getenv("ProgramFiles"), "Docker", "cli-plugins"),`
`10`	`11`	`}`