From e7077f7d26f898fa143d9d3919d5da1ced1c27fe Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Thu, 12 Jan 2017 14:00:56 -0800 Subject: [PATCH] Windows: Add service dependency ConDrv Signed-off-by: Darren Stahl (cherry picked from commit b2a7f6abb379e96eb611c27a5bec10c3be854a75) Signed-off-by: Victor Vieux --- cmd/dockerd/service_windows.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/dockerd/service_windows.go b/cmd/dockerd/service_windows.go index 7ad7e389d8..dd37abcf3c 100644 --- a/cmd/dockerd/service_windows.go +++ b/cmd/dockerd/service_windows.go @@ -13,6 +13,7 @@ import ( "unsafe" "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/system" "github.com/spf13/pflag" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" @@ -165,10 +166,20 @@ func registerService() error { return err } defer m.Disconnect() + + depends := []string{} + + // This dependency is required on build 14393 (RS1) + // it is added to the platform in newer builds + if system.GetOSVersion().Build == 14393 { + depends = append(depends, "ConDrv") + } + c := mgr.Config{ ServiceType: windows.SERVICE_WIN32_OWN_PROCESS, StartType: mgr.StartAutomatic, ErrorControl: mgr.ErrorNormal, + Dependencies: depends, DisplayName: "Docker Engine", }