Merge pull request #13542 from kvasdopil/freebsd-work

Make docker build on FreeBSD Upstream-commit: 75f8bdd970e5355a6238e7b41a9f1aee9cd3f890 Component: engine
2015-07-29 15:15:37 -07:00
parent 22c6edd13b 59df5a01ec
commit 4cd45101c0
25 changed files with 154 additions and 12 deletions
--- a/components/engine/daemon/graphdriver/driver_freebsd.go
+++ b/components/engine/daemon/graphdriver/driver_freebsd.go
@ -0,0 +1,8 @@
+package graphdriver
+
+var (
+	// Slice of drivers that should be used in an order
+	priority = []string{
+		"zfs",
+	}
+)
--- a/components/engine/daemon/graphdriver/driver_unsupported.go
+++ b/components/engine/daemon/graphdriver/driver_unsupported.go
@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build !linux,!windows,!freebsd

 package graphdriver

--- a/components/engine/daemon/graphdriver/zfs/zfs.go
+++ b/components/engine/daemon/graphdriver/zfs/zfs.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd

 package zfs