From 4d3a76d71e368b7ccff6184d2c65e588b543f293 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Tue, 19 Mar 2019 09:30:14 -0700 Subject: [PATCH] Search Windows CLI plugins also in ProgramFiles Signed-off-by: Stefan Scherer --- cli-plugins/manager/manager_windows.go | 1 + docs/extend/cli_plugins.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cli-plugins/manager/manager_windows.go b/cli-plugins/manager/manager_windows.go index b628685803..2ce5a75973 100644 --- 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 index 4721bafcd1..766e54ff3a 100644 --- 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`.