Merge pull request #34448 from Microsoft/jjh/donotblockexport

LCOW: Don't block export
This commit is contained in:
Justin Cormack 2017-08-09 14:17:25 +01:00 committed by GitHub
commit ac87bb3f85
1 changed files with 4 additions and 4 deletions

View File

@ -13,15 +13,15 @@ import (
// ContainerExport writes the contents of the container to the given
// writer. An error is returned if the container cannot be found.
func (daemon *Daemon) ContainerExport(name string, out io.Writer) error {
if runtime.GOOS == "windows" {
return fmt.Errorf("the daemon on this platform does not support export of a container")
}
container, err := daemon.GetContainer(name)
if err != nil {
return err
}
if runtime.GOOS == "windows" && container.Platform == "windows" {
return fmt.Errorf("the daemon on this platform does not support exporting Windows containers")
}
data, err := daemon.containerExport(container)
if err != nil {
return fmt.Errorf("Error exporting container %s: %v", name, err)