From 9a9dc5ba96d2661f5dc2037db44d0984d2129946 Mon Sep 17 00:00:00 2001 From: John Howard Date: Mon, 27 Apr 2015 07:53:12 -0700 Subject: [PATCH] Windows: Don't build Linux graph drivers Signed-off-by: John Howard --- daemon/daemon_aufs.go | 2 +- daemon/daemon_btrfs.go | 2 +- daemon/daemon_devicemapper.go | 2 +- daemon/daemon_no_aufs.go | 2 +- daemon/daemon_overlay.go | 2 +- daemon/graphdriver/aufs/aufs.go | 28 ++++++++++--------- daemon/graphdriver/aufs/aufs_test.go | 2 ++ daemon/graphdriver/aufs/dirs.go | 2 ++ daemon/graphdriver/aufs/migrate.go | 2 ++ daemon/graphdriver/aufs/mount.go | 2 ++ daemon/graphdriver/aufs/mount_unsupported.go | 2 +- daemon/graphdriver/btrfs/btrfs_test.go | 2 ++ daemon/graphdriver/overlay/overlay_test.go | 2 ++ .../overlay/overlay_unsupported.go | 3 ++ daemon/graphdriver/vfs/driver.go | 5 +++- daemon/graphdriver/vfs/driver_unsupported.go | 3 ++ daemon/graphdriver/vfs/vfs_test.go | 2 ++ 17 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 daemon/graphdriver/overlay/overlay_unsupported.go create mode 100644 daemon/graphdriver/vfs/driver_unsupported.go diff --git a/daemon/daemon_aufs.go b/daemon/daemon_aufs.go index 377e829793..4bb553d0af 100644 --- a/daemon/daemon_aufs.go +++ b/daemon/daemon_aufs.go @@ -1,4 +1,4 @@ -// +build !exclude_graphdriver_aufs +// +build !exclude_graphdriver_aufs,linux package daemon diff --git a/daemon/daemon_btrfs.go b/daemon/daemon_btrfs.go index cd505c356b..61dac0dd50 100644 --- a/daemon/daemon_btrfs.go +++ b/daemon/daemon_btrfs.go @@ -1,4 +1,4 @@ -// +build !exclude_graphdriver_btrfs +// +build !exclude_graphdriver_btrfs,linux package daemon diff --git a/daemon/daemon_devicemapper.go b/daemon/daemon_devicemapper.go index 477754559a..5b64c453fe 100644 --- a/daemon/daemon_devicemapper.go +++ b/daemon/daemon_devicemapper.go @@ -1,4 +1,4 @@ -// +build !exclude_graphdriver_devicemapper +// +build !exclude_graphdriver_devicemapper,linux package daemon diff --git a/daemon/daemon_no_aufs.go b/daemon/daemon_no_aufs.go index 06cdc776d7..921b395825 100644 --- a/daemon/daemon_no_aufs.go +++ b/daemon/daemon_no_aufs.go @@ -1,4 +1,4 @@ -// +build exclude_graphdriver_aufs +// +build exclude_graphdriver_aufs,linux package daemon diff --git a/daemon/daemon_overlay.go b/daemon/daemon_overlay.go index 25d6e80285..25a42a1931 100644 --- a/daemon/daemon_overlay.go +++ b/daemon/daemon_overlay.go @@ -1,4 +1,4 @@ -// +build !exclude_graphdriver_overlay +// +build !exclude_graphdriver_overlay,linux package daemon diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index b319d24713..ecbbdf8187 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -1,20 +1,22 @@ +// +build linux + /* aufs driver directory structure -. -├── layers // Metadata of layers -│   ├── 1 -│   ├── 2 -│   └── 3 -├── diff // Content of the layer -│   ├── 1 // Contains layers that need to be mounted for the id -│   ├── 2 -│   └── 3 -└── mnt // Mount points for the rw layers to be mounted - ├── 1 - ├── 2 - └── 3 + . + ├── layers // Metadata of layers + │ ├── 1 + │ ├── 2 + │ └── 3 + ├── diff // Content of the layer + │ ├── 1 // Contains layers that need to be mounted for the id + │ ├── 2 + │ └── 3 + └── mnt // Mount points for the rw layers to be mounted + ├── 1 + ├── 2 + └── 3 */ diff --git a/daemon/graphdriver/aufs/aufs_test.go b/daemon/graphdriver/aufs/aufs_test.go index 6dea9bb515..ab2b994138 100644 --- a/daemon/graphdriver/aufs/aufs_test.go +++ b/daemon/graphdriver/aufs/aufs_test.go @@ -1,3 +1,5 @@ +// +build linux + package aufs import ( diff --git a/daemon/graphdriver/aufs/dirs.go b/daemon/graphdriver/aufs/dirs.go index fb9b81edd2..08f1ffc0ed 100644 --- a/daemon/graphdriver/aufs/dirs.go +++ b/daemon/graphdriver/aufs/dirs.go @@ -1,3 +1,5 @@ +// +build linux + package aufs import ( diff --git a/daemon/graphdriver/aufs/migrate.go b/daemon/graphdriver/aufs/migrate.go index dd61098e8a..08d8ebebb3 100644 --- a/daemon/graphdriver/aufs/migrate.go +++ b/daemon/graphdriver/aufs/migrate.go @@ -1,3 +1,5 @@ +// +build linux + package aufs import ( diff --git a/daemon/graphdriver/aufs/mount.go b/daemon/graphdriver/aufs/mount.go index 0a3d9d16a0..b82b17f2d3 100644 --- a/daemon/graphdriver/aufs/mount.go +++ b/daemon/graphdriver/aufs/mount.go @@ -1,3 +1,5 @@ +// +build linux + package aufs import ( diff --git a/daemon/graphdriver/aufs/mount_unsupported.go b/daemon/graphdriver/aufs/mount_unsupported.go index e291bef3aa..0cc31d54fc 100644 --- a/daemon/graphdriver/aufs/mount_unsupported.go +++ b/daemon/graphdriver/aufs/mount_unsupported.go @@ -7,5 +7,5 @@ import "errors" const MsRemount = 0 func mount(source string, target string, fstype string, flags uintptr, data string) (err error) { - return errors.New("mount is not implemented on darwin") + return errors.New("mount is not implemented on this platform") } diff --git a/daemon/graphdriver/btrfs/btrfs_test.go b/daemon/graphdriver/btrfs/btrfs_test.go index cde23ce4a0..bfd15e06f5 100644 --- a/daemon/graphdriver/btrfs/btrfs_test.go +++ b/daemon/graphdriver/btrfs/btrfs_test.go @@ -1,3 +1,5 @@ +// +build linux + package btrfs import ( diff --git a/daemon/graphdriver/overlay/overlay_test.go b/daemon/graphdriver/overlay/overlay_test.go index 88194e4ff8..76b6313b6d 100644 --- a/daemon/graphdriver/overlay/overlay_test.go +++ b/daemon/graphdriver/overlay/overlay_test.go @@ -1,3 +1,5 @@ +// +build linux + package overlay import ( diff --git a/daemon/graphdriver/overlay/overlay_unsupported.go b/daemon/graphdriver/overlay/overlay_unsupported.go new file mode 100644 index 0000000000..3dbb4de44e --- /dev/null +++ b/daemon/graphdriver/overlay/overlay_unsupported.go @@ -0,0 +1,3 @@ +// +build !linux + +package overlay diff --git a/daemon/graphdriver/vfs/driver.go b/daemon/graphdriver/vfs/driver.go index 47d70fde5c..521e822826 100644 --- a/daemon/graphdriver/vfs/driver.go +++ b/daemon/graphdriver/vfs/driver.go @@ -1,3 +1,5 @@ +// +build linux + package vfs import ( @@ -7,6 +9,7 @@ import ( "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/chrootarchive" + "github.com/docker/docker/pkg/system" "github.com/docker/libcontainer/label" ) @@ -39,7 +42,7 @@ func (d *Driver) Cleanup() error { func (d *Driver) Create(id, parent string) error { dir := d.dir(id) - if err := os.MkdirAll(path.Dir(dir), 0700); err != nil { + if err := system.MkdirAll(path.Dir(dir), 0700); err != nil { return err } if err := os.Mkdir(dir, 0755); err != nil { diff --git a/daemon/graphdriver/vfs/driver_unsupported.go b/daemon/graphdriver/vfs/driver_unsupported.go new file mode 100644 index 0000000000..cacc2af91b --- /dev/null +++ b/daemon/graphdriver/vfs/driver_unsupported.go @@ -0,0 +1,3 @@ +// +build !linux + +package vfs diff --git a/daemon/graphdriver/vfs/vfs_test.go b/daemon/graphdriver/vfs/vfs_test.go index 1ee6ae4a90..9ecf21dbaa 100644 --- a/daemon/graphdriver/vfs/vfs_test.go +++ b/daemon/graphdriver/vfs/vfs_test.go @@ -1,3 +1,5 @@ +// +build linux + package vfs import (