From 1868142b6e29b50d276171a077c6d5c40aa03225 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 16 Jun 2015 09:08:10 -0400 Subject: [PATCH] Fix circular import for windows vfs graphdriver Signed-off-by: Brian Goff Upstream-commit: 49834e8d5922f8c256124177b188d89007af03f6 Component: engine --- components/engine/daemon/daemon.go | 1 + components/engine/daemon/daemon_unix.go | 1 - components/engine/daemon/graphdriver/driver_windows.go | 6 ------ 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/components/engine/daemon/daemon.go b/components/engine/daemon/daemon.go index 60d45b6a80..cd5f81e574 100644 --- a/components/engine/daemon/daemon.go +++ b/components/engine/daemon/daemon.go @@ -19,6 +19,7 @@ import ( "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver/execdrivers" "github.com/docker/docker/daemon/graphdriver" + _ "github.com/docker/docker/daemon/graphdriver/vfs" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/network" "github.com/docker/docker/graph" diff --git a/components/engine/daemon/daemon_unix.go b/components/engine/daemon/daemon_unix.go index 32cd3d358a..29a3c5d3dc 100644 --- a/components/engine/daemon/daemon_unix.go +++ b/components/engine/daemon/daemon_unix.go @@ -13,7 +13,6 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/graphdriver" - _ "github.com/docker/docker/daemon/graphdriver/vfs" "github.com/docker/docker/graph" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/fileutils" diff --git a/components/engine/daemon/graphdriver/driver_windows.go b/components/engine/daemon/graphdriver/driver_windows.go index 5a825cb227..574b357c8d 100644 --- a/components/engine/daemon/graphdriver/driver_windows.go +++ b/components/engine/daemon/graphdriver/driver_windows.go @@ -1,11 +1,5 @@ package graphdriver -import ( - _ "github.com/docker/docker/daemon/graphdriver/vfs" - - // TODO Windows - Add references to real graph driver when PR'd -) - type DiffDiskDriver interface { Driver CopyDiff(id, sourceId string) error