beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33384 from Microsoft/jjh/sandboxpath

Browse source 
Windows: Remove unused SandboxPath
This commit is contained in:
Vincent Demeester 2017-05-25 11:21:15 -07:00 committed by GitHub
commit e925820bfd
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/start_windows.go
View file

@ -45,10 +45,6 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get layer metadata - %s", err) return nil, fmt.Errorf("failed to get layer metadata - %s", err)
} }
if hvOpts.IsHyperV {
hvOpts.SandboxPath = filepath.Dir(m["dir"])
}
layerOpts.LayerFolderPath = m["dir"] layerOpts.LayerFolderPath = m["dir"]
// Generate the layer paths of the layer options // Generate the layer paths of the layer options

3
libcontainerd/client_windows.go
View file

@ -49,7 +49,6 @@ const defaultOwner = "docker"
// | VolumePath | \\?\\Volume{GUIDa} | | // | VolumePath | \\?\\Volume{GUIDa} | |
// | LayerFolderPath | %root%\windowsfilter\containerID | %root%\windowsfilter\containerID (servicing only) | // | LayerFolderPath | %root%\windowsfilter\containerID | %root%\windowsfilter\containerID (servicing only) |
// | Layers[] | ID=GUIDb;Path=%root%\windowsfilter\layerID | ID=GUIDb;Path=%root%\windowsfilter\layerID | // | Layers[] | ID=GUIDb;Path=%root%\windowsfilter\layerID | ID=GUIDb;Path=%root%\windowsfilter\layerID |
// | SandboxPath | | %root%\windowsfilter |
// | HvRuntime | | ImagePath=%root%\BaseLayerID\UtilityVM | // | HvRuntime | | ImagePath=%root%\BaseLayerID\UtilityVM |
// +-----------------+--------------------------------------------+---------------------------------------------------+ // +-----------------+--------------------------------------------+---------------------------------------------------+
// //
@ -88,7 +87,6 @@ const defaultOwner = "docker"
// }], // }],
// "HostName": "475c2c58933b", // "HostName": "475c2c58933b",
// "MappedDirectories": [], // "MappedDirectories": [],
// "SandboxPath": "C:\\\\control\\\\windowsfilter",
// "HvPartition": true, // "HvPartition": true,
// "EndpointList": ["e1bb1e61-d56f-405e-b75d-fd520cefa0cb"], // "EndpointList": ["e1bb1e61-d56f-405e-b75d-fd520cefa0cb"],
// "DNSSearchList": "a.com,b.com,c.com", // "DNSSearchList": "a.com,b.com,c.com",
@ -159,7 +157,6 @@ func (clnt *client) Create(containerID string, checkpoint string, checkpointDir
} }
if h, ok := option.(*HyperVIsolationOption); ok { if h, ok := option.(*HyperVIsolationOption); ok {
configuration.HvPartition = h.IsHyperV configuration.HvPartition = h.IsHyperV
configuration.SandboxPath = h.SandboxPath
continue continue
} }
if l, ok := option.(*LayerOption); ok { if l, ok := option.(*LayerOption); ok {

5
libcontainerd/types_windows.go
View file

@ -39,10 +39,9 @@ type FlushOption struct {
} }
// HyperVIsolationOption is a CreateOption that indicates whether the runtime // HyperVIsolationOption is a CreateOption that indicates whether the runtime
// should start the container as a Hyper-V container, and if so, the sandbox path. // should start the container as a Hyper-V container.
type HyperVIsolationOption struct { type HyperVIsolationOption struct {
IsHyperV bool IsHyperV bool
SandboxPath string `json:",omitempty"`
} }
// LayerOption is a CreateOption that indicates to the runtime the layer folder // LayerOption is a CreateOption that indicates to the runtime the layer folder