1. docker
  2. Commit 91154e9235c71bc120b93d2e16632970e0f0ce0e
Browse code

Move graph driver registration out of the daemon package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Daniel Nephin authored on 2015/12/24 03:43:34
Showing 13 changed files
daemon/daemon.go
History View file @ 91154e9
... ... 
@@ -30,7 +30,8 @@ import (
30 30 
 	"github.com/docker/docker/daemon/exec"
31 31 
 	"github.com/docker/docker/daemon/execdriver"
32 32 
 	"github.com/docker/docker/daemon/execdriver/execdrivers"
33 
-	_ "github.com/docker/docker/daemon/graphdriver/vfs" // register vfs
33 
+	// register graph drivers
34 
+	_ "github.com/docker/docker/daemon/graphdriver/register"
34 35 
 	"github.com/docker/docker/daemon/logger"
35 36 
 	"github.com/docker/docker/daemon/network"
36 37 
 	"github.com/docker/docker/distribution"
daemon/daemon_aufs.go
History View file @ 91154e9
37 38 
deleted file mode 100644
... ... 
@@ -1,8 +0,0 @@
1 
-// +build !exclude_graphdriver_aufs,linux
2 
-
3 
-package daemon
4 
-
5 
-import (
6 
-	// register the aufs graphdriver
7 
-	_ "github.com/docker/docker/daemon/graphdriver/aufs"
8 
-)
daemon/daemon_btrfs.go
History View file @ 91154e9
9 1 
deleted file mode 100644
... ... 
@@ -1,8 +0,0 @@
1 
-// +build !exclude_graphdriver_btrfs,linux
2 
-
3 
-package daemon
4 
-
5 
-import (
6 
-	// register the btrfs graphdriver
7 
-	_ "github.com/docker/docker/daemon/graphdriver/btrfs"
8 
-)
daemon/daemon_devicemapper.go
History View file @ 91154e9
9 1 
deleted file mode 100644
... ... 
@@ -1,8 +0,0 @@
1 
-// +build !exclude_graphdriver_devicemapper,linux
2 
-
3 
-package daemon
4 
-
5 
-import (
6 
-	// register the devmapper graphdriver
7 
-	_ "github.com/docker/docker/daemon/graphdriver/devmapper"
8 
-)
daemon/daemon_overlay.go
History View file @ 91154e9
9 1 
deleted file mode 100644
... ... 
@@ -1,8 +0,0 @@
1 
-// +build !exclude_graphdriver_overlay,linux
2 
-
3 
-package daemon
4 
-
5 
-import (
6 
-	// register the overlay graphdriver
7 
-	_ "github.com/docker/docker/daemon/graphdriver/overlay"
8 
-)
daemon/daemon_zfs.go
History View file @ 91154e9
9 1 
deleted file mode 100644
... ... 
@@ -1,8 +0,0 @@
1 
-// +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
2 
-
3 
-package daemon
4 
-
5 
-import (
6 
-	// register the zfs driver
7 
-	_ "github.com/docker/docker/daemon/graphdriver/zfs"
8 
-)
daemon/graphdriver/register/register_aufs.go
History View file @ 91154e9
9 1 
new file mode 100644
... ... 
@@ -0,0 +1,8 @@
0 
+// +build !exclude_graphdriver_aufs,linux
1 
+
2 
+package register
3 
+
4 
+import (
5 
+	// register the aufs graphdriver
6 
+	_ "github.com/docker/docker/daemon/graphdriver/aufs"
7 
+)
daemon/graphdriver/register/register_btrfs.go
History View file @ 91154e9
0 8 
new file mode 100644
... ... 
@@ -0,0 +1,8 @@
0 
+// +build !exclude_graphdriver_btrfs,linux
1 
+
2 
+package register
3 
+
4 
+import (
5 
+	// register the btrfs graphdriver
6 
+	_ "github.com/docker/docker/daemon/graphdriver/btrfs"
7 
+)
daemon/graphdriver/register/register_devicemapper.go
History View file @ 91154e9
0 8 
new file mode 100644
... ... 
@@ -0,0 +1,8 @@
0 
+// +build !exclude_graphdriver_devicemapper,linux
1 
+
2 
+package register
3 
+
4 
+import (
5 
+	// register the devmapper graphdriver
6 
+	_ "github.com/docker/docker/daemon/graphdriver/devmapper"
7 
+)
daemon/graphdriver/register/register_overlay.go
History View file @ 91154e9
0 8 
new file mode 100644
... ... 
@@ -0,0 +1,8 @@
0 
+// +build !exclude_graphdriver_overlay,linux
1 
+
2 
+package register
3 
+
4 
+import (
5 
+	// register the overlay graphdriver
6 
+	_ "github.com/docker/docker/daemon/graphdriver/overlay"
7 
+)
daemon/graphdriver/register/register_vfs.go
History View file @ 91154e9
0 8 
new file mode 100644
... ... 
@@ -0,0 +1,6 @@
0 
+package register
1 
+
2 
+import (
3 
+	// register vfs
4 
+	_ "github.com/docker/docker/daemon/graphdriver/vfs"
5 
+)
daemon/graphdriver/register/register_windows.go
History View file @ 91154e9
0 6 
new file mode 100644
... ... 
@@ -0,0 +1,6 @@
0 
+package register
1 
+
2 
+import (
3 
+	// register the windows graph driver
4 
+	_ "github.com/docker/docker/daemon/graphdriver/windows"
5 
+)
daemon/graphdriver/register/register_zfs.go
History View file @ 91154e9
0 6 
new file mode 100644
... ... 
@@ -0,0 +1,8 @@
0 
+// +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
1 
+
2 
+package register
3 
+
4 
+import (
5 
+	// register the zfs driver
6 
+	_ "github.com/docker/docker/daemon/graphdriver/zfs"
7 
+)