瀏覽代碼

Windows: Fix up container again

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard 10 年之前
父節點
當前提交
5d207de509
共有 3 個文件被更改,包括 24 次插入20 次删除
  1. 0 20
      daemon/container.go
  2. 20 0
      daemon/container_linux.go
  3. 4 0
      daemon/container_windows.go

+ 0 - 20
daemon/container.go

@@ -1087,26 +1087,6 @@ func (container *Container) shouldRestart() bool {
 		(container.hostConfig.RestartPolicy.Name == "on-failure" && container.ExitCode != 0)
 }
 
-func (container *Container) UnmountVolumes(forceSyscall bool) error {
-	for _, m := range container.MountPoints {
-		dest, err := container.GetResourcePath(m.Destination)
-		if err != nil {
-			return err
-		}
-
-		if forceSyscall {
-			syscall.Unmount(dest, 0)
-		}
-
-		if m.Volume != nil {
-			if err := m.Volume.Unmount(); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 func (container *Container) copyImagePathContent(v volume.Volume, destination string) error {
 	rootfs, err := symlink.FollowSymlinkInScope(filepath.Join(container.basefs, destination), container.basefs)
 	if err != nil {

+ 20 - 0
daemon/container_linux.go

@@ -954,3 +954,23 @@ func (container *Container) DisableLink(name string) {
 		}
 	}
 }
+
+func (container *Container) UnmountVolumes(forceSyscall bool) error {
+	for _, m := range container.MountPoints {
+		dest, err := container.GetResourcePath(m.Destination)
+		if err != nil {
+			return err
+		}
+
+		if forceSyscall {
+			syscall.Unmount(dest, 0)
+		}
+
+		if m.Volume != nil {
+			if err := m.Volume.Unmount(); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}

+ 4 - 0
daemon/container_windows.go

@@ -165,3 +165,7 @@ func disableAllActiveLinks(container *Container) {
 
 func (container *Container) DisableLink(name string) {
 }
+
+func (container *Container) UnmountVolumes(forceSyscall bool) error {
+	return nil
+}