From 7c9671c8192aa038a1e24bcf7d6657ed2100c2ba Mon Sep 17 00:00:00 2001 From: Michal Wieczorek Date: Fri, 26 Aug 2016 22:11:58 +0200 Subject: [PATCH] fix spec file support for Windows plugin discovery (#25903) Signed-off-by: Michal Wieczorek Upstream-commit: 52c0daad82b424afc661c23c1d80784d014e1a58 Component: engine --- components/engine/pkg/plugins/discovery_unix.go | 2 ++ components/engine/pkg/plugins/discovery_windows.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/pkg/plugins/discovery_unix.go b/components/engine/pkg/plugins/discovery_unix.go index 007d6185ee..693a47e394 100644 --- a/components/engine/pkg/plugins/discovery_unix.go +++ b/components/engine/pkg/plugins/discovery_unix.go @@ -1,3 +1,5 @@ +// +build !windows + package plugins var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"} diff --git a/components/engine/pkg/plugins/discovery_windows.go b/components/engine/pkg/plugins/discovery_windows.go index 59b35d3e91..d7c1fe4942 100644 --- a/components/engine/pkg/plugins/discovery_windows.go +++ b/components/engine/pkg/plugins/discovery_windows.go @@ -5,4 +5,4 @@ import ( "path/filepath" ) -var specPaths = []string{filepath.Join(os.Getenv("programdata"), "docker", "plugins")} +var specsPaths = []string{filepath.Join(os.Getenv("programdata"), "docker", "plugins")}