diff options
author | David Calavera <david.calavera@gmail.com> | 2015-11-02 20:06:09 -0500 |
---|---|---|
committer | David Calavera <david.calavera@gmail.com> | 2015-11-04 12:27:47 -0500 |
commit | 3a497650464b40191bd2cde348e676acf4efe270 (patch) | |
tree | 255cbcedaa5c5e53856dcca20b38b03e6ca8140f /daemon/container_windows.go | |
parent | 1c94f5f53a47997f76cafb633092fce9dbdab3ea (diff) | |
download | docker-3a497650464b40191bd2cde348e676acf4efe270.tar.gz |
Decouple daemon and container to mount and unmount filesystems.
Side effects:
- Decouple daemon and container to start containers.
- Decouple daemon and container to copy files.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Diffstat (limited to 'daemon/container_windows.go')
-rw-r--r-- | daemon/container_windows.go | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/daemon/container_windows.go b/daemon/container_windows.go index ff7c1721f2..f618cd8c23 100644 --- a/daemon/container_windows.go +++ b/daemon/container_windows.go @@ -5,7 +5,6 @@ package daemon import ( "strings" - "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" derr "github.com/docker/docker/errors" "github.com/docker/docker/volume" @@ -143,8 +142,8 @@ func populateCommand(c *Container, env []string) error { return nil } -// GetSize returns real size & virtual size -func (container *Container) getSize() (int64, int64) { +// getSize returns real size & virtual size +func (daemon *Daemon) getSize(container *Container) (int64, int64) { // TODO Windows return 0, 0 } @@ -191,26 +190,3 @@ func (container *Container) ipcMounts() []execdriver.Mount { func getDefaultRouteMtu() (int, error) { return -1, errSystemNotSupported } - -// conditionalMountOnStart is a platform specific helper function during the -// container start to call mount. -func (container *Container) conditionalMountOnStart() error { - // We do not mount if a Hyper-V container - if !container.hostConfig.Isolation.IsHyperV() { - if err := container.Mount(); err != nil { - return err - } - } - return nil -} - -// conditionalUnmountOnCleanup is a platform specific helper function called -// during the cleanup of a container to unmount. -func (container *Container) conditionalUnmountOnCleanup() { - // We do not unmount if a Hyper-V container - if !container.hostConfig.Isolation.IsHyperV() { - if err := container.Unmount(); err != nil { - logrus.Errorf("%v: Failed to umount filesystem: %v", container.ID, err) - } - } -} |