daemon: remove leftover LCOW platform checks
This removes some of the checks that were added in 0cba7740d4
,
but should no longer be needed.
- `Daemon.create()`: fix the error message, which assumed it could only occur on Windows.
- `Daemon.cleanupContainer()`: no need to validate container platform to delete it.
- `Daemon.containerExport`: if a container was created, we should be able to
export it; no need to validate.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
cfddecc3d2
commit
e30a4a438b
|
@ -123,10 +123,10 @@ func (daemon *Daemon) create(opts createOpts) (retC *container.Container, retErr
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
os = img.OperatingSystem()
|
os = img.OperatingSystem()
|
||||||
imgID = img.ID()
|
|
||||||
if !system.IsOSSupported(os) {
|
if !system.IsOSSupported(os) {
|
||||||
return nil, errors.New("operating system on which parent image was created is not Windows")
|
return nil, system.ErrNotSupportedOperatingSystem
|
||||||
}
|
}
|
||||||
|
imgID = img.ID()
|
||||||
} else if isWindows {
|
} else if isWindows {
|
||||||
os = "linux" // 'scratch' case.
|
os = "linux" // 'scratch' case.
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,9 +92,6 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, forceRemo
|
||||||
return fmt.Errorf("Could not kill running container %s, cannot remove - %v", container.ID, err)
|
return fmt.Errorf("Could not kill running container %s, cannot remove - %v", container.ID, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !system.IsOSSupported(container.OS) {
|
|
||||||
return fmt.Errorf("cannot remove %s: %s ", container.ID, system.ErrNotSupportedOperatingSystem)
|
|
||||||
}
|
|
||||||
|
|
||||||
// stop collection of stats for the container regardless
|
// stop collection of stats for the container regardless
|
||||||
// if stats are currently getting collected.
|
// if stats are currently getting collected.
|
||||||
|
|
|
@ -8,7 +8,6 @@ import (
|
||||||
"github.com/docker/docker/errdefs"
|
"github.com/docker/docker/errdefs"
|
||||||
"github.com/docker/docker/pkg/archive"
|
"github.com/docker/docker/pkg/archive"
|
||||||
"github.com/docker/docker/pkg/ioutils"
|
"github.com/docker/docker/pkg/ioutils"
|
||||||
"github.com/docker/docker/pkg/system"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// ContainerExport writes the contents of the container to the given
|
// ContainerExport writes the contents of the container to the given
|
||||||
|
@ -47,9 +46,6 @@ func (daemon *Daemon) ContainerExport(name string, out io.Writer) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (daemon *Daemon) containerExport(container *container.Container) (arch io.ReadCloser, err error) {
|
func (daemon *Daemon) containerExport(container *container.Container) (arch io.ReadCloser, err error) {
|
||||||
if !system.IsOSSupported(container.OS) {
|
|
||||||
return nil, fmt.Errorf("cannot export %s: %s ", container.ID, system.ErrNotSupportedOperatingSystem)
|
|
||||||
}
|
|
||||||
rwlayer, err := daemon.imageService.GetLayerByID(container.ID)
|
rwlayer, err := daemon.imageService.GetLayerByID(container.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
Loading…
Reference in New Issue