Bladeren bron

Windows: Don't build Linux graph drivers

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard 10 jaren geleden
bovenliggende
commit
9a9dc5ba96

+ 1 - 1
daemon/daemon_aufs.go

@@ -1,4 +1,4 @@
-// +build !exclude_graphdriver_aufs
+// +build !exclude_graphdriver_aufs,linux
 
 
 package daemon
 package daemon
 
 

+ 1 - 1
daemon/daemon_btrfs.go

@@ -1,4 +1,4 @@
-// +build !exclude_graphdriver_btrfs
+// +build !exclude_graphdriver_btrfs,linux
 
 
 package daemon
 package daemon
 
 

+ 1 - 1
daemon/daemon_devicemapper.go

@@ -1,4 +1,4 @@
-// +build !exclude_graphdriver_devicemapper
+// +build !exclude_graphdriver_devicemapper,linux
 
 
 package daemon
 package daemon
 
 

+ 1 - 1
daemon/daemon_no_aufs.go

@@ -1,4 +1,4 @@
-// +build exclude_graphdriver_aufs
+// +build exclude_graphdriver_aufs,linux
 
 
 package daemon
 package daemon
 
 

+ 1 - 1
daemon/daemon_overlay.go

@@ -1,4 +1,4 @@
-// +build !exclude_graphdriver_overlay
+// +build !exclude_graphdriver_overlay,linux
 
 
 package daemon
 package daemon
 
 

+ 15 - 13
daemon/graphdriver/aufs/aufs.go

@@ -1,20 +1,22 @@
+// +build linux
+
 /*
 /*
 
 
 aufs driver directory structure
 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
 
 
 */
 */
 
 

+ 2 - 0
daemon/graphdriver/aufs/aufs_test.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package aufs
 package aufs
 
 
 import (
 import (

+ 2 - 0
daemon/graphdriver/aufs/dirs.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package aufs
 package aufs
 
 
 import (
 import (

+ 2 - 0
daemon/graphdriver/aufs/migrate.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package aufs
 package aufs
 
 
 import (
 import (

+ 2 - 0
daemon/graphdriver/aufs/mount.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package aufs
 package aufs
 
 
 import (
 import (

+ 1 - 1
daemon/graphdriver/aufs/mount_unsupported.go

@@ -7,5 +7,5 @@ import "errors"
 const MsRemount = 0
 const MsRemount = 0
 
 
 func mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
 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")
 }
 }

+ 2 - 0
daemon/graphdriver/btrfs/btrfs_test.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package btrfs
 package btrfs
 
 
 import (
 import (

+ 2 - 0
daemon/graphdriver/overlay/overlay_test.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package overlay
 package overlay
 
 
 import (
 import (

+ 3 - 0
daemon/graphdriver/overlay/overlay_unsupported.go

@@ -0,0 +1,3 @@
+// +build !linux
+
+package overlay

+ 4 - 1
daemon/graphdriver/vfs/driver.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package vfs
 package vfs
 
 
 import (
 import (
@@ -7,6 +9,7 @@ import (
 
 
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/pkg/chrootarchive"
 	"github.com/docker/docker/pkg/chrootarchive"
+	"github.com/docker/docker/pkg/system"
 	"github.com/docker/libcontainer/label"
 	"github.com/docker/libcontainer/label"
 )
 )
 
 
@@ -39,7 +42,7 @@ func (d *Driver) Cleanup() error {
 
 
 func (d *Driver) Create(id, parent string) error {
 func (d *Driver) Create(id, parent string) error {
 	dir := d.dir(id)
 	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
 		return err
 	}
 	}
 	if err := os.Mkdir(dir, 0755); err != nil {
 	if err := os.Mkdir(dir, 0755); err != nil {

+ 3 - 0
daemon/graphdriver/vfs/driver_unsupported.go

@@ -0,0 +1,3 @@
+// +build !linux
+
+package vfs

+ 2 - 0
daemon/graphdriver/vfs/vfs_test.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package vfs
 package vfs
 
 
 import (
 import (