|
@@ -24,7 +24,6 @@ import (
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/docker/docker/daemon/initlayer"
|
|
"github.com/docker/docker/daemon/initlayer"
|
|
- "github.com/docker/docker/image"
|
|
|
|
"github.com/docker/docker/opts"
|
|
"github.com/docker/docker/opts"
|
|
"github.com/docker/docker/pkg/containerfs"
|
|
"github.com/docker/docker/pkg/containerfs"
|
|
"github.com/docker/docker/pkg/idtools"
|
|
"github.com/docker/docker/pkg/idtools"
|
|
@@ -1360,17 +1359,6 @@ func (daemon *Daemon) setDefaultIsolation() error {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
|
|
|
|
- var layers []string
|
|
|
|
- for _, l := range rootfs.DiffIDs {
|
|
|
|
- layers = append(layers, l.String())
|
|
|
|
- }
|
|
|
|
- return types.RootFS{
|
|
|
|
- Type: rootfs.Type,
|
|
|
|
- Layers: layers,
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
// setupDaemonProcess sets various settings for the daemon's process
|
|
// setupDaemonProcess sets various settings for the daemon's process
|
|
func setupDaemonProcess(config *config.Config) error {
|
|
func setupDaemonProcess(config *config.Config) error {
|
|
// setup the daemons oom_score_adj
|
|
// setup the daemons oom_score_adj
|