Merge pull request moby#33384 from Microsoft/jjh/sandboxpath

Vincent Demeester · web-flow · commit e925820bfd5a · 2017-05-25T11:21:15.000-07:00
Windows: Remove unused SandboxPath
diff --git a/daemon/start_windows.go b/daemon/start_windows.go
@@ -45,10 +45,6 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
 	if err != nil {
 		return nil, fmt.Errorf("failed to get layer metadata - %s", err)
 	}
-	if hvOpts.IsHyperV {
-		hvOpts.SandboxPath = filepath.Dir(m["dir"])
-	}
-
 	layerOpts.LayerFolderPath = m["dir"]
 
 	// Generate the layer paths of the layer options
diff --git a/libcontainerd/client_windows.go b/libcontainerd/client_windows.go
@@ -49,7 +49,6 @@ const defaultOwner = "docker"
 // | VolumePath      | \\?\\Volume{GUIDa}                         |                                                   |
 // | LayerFolderPath | %root%\windowsfilter\containerID           | %root%\windowsfilter\containerID (servicing only) |
 // | Layers[]        | ID=GUIDb;Path=%root%\windowsfilter\layerID | ID=GUIDb;Path=%root%\windowsfilter\layerID        |
-// | SandboxPath     |                                            | %root%\windowsfilter                              |
 // | HvRuntime       |                                            | ImagePath=%root%\BaseLayerID\UtilityVM            |
 // +-----------------+--------------------------------------------+---------------------------------------------------+
 //
@@ -88,7 +87,6 @@ const defaultOwner = "docker"
 //	}],
 //	"HostName": "475c2c58933b",
 //	"MappedDirectories": [],
-//	"SandboxPath": "C:\\\\control\\\\windowsfilter",
 //	"HvPartition": true,
 //	"EndpointList": ["e1bb1e61-d56f-405e-b75d-fd520cefa0cb"],
 //	"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 {
 			configuration.HvPartition = h.IsHyperV
-			configuration.SandboxPath = h.SandboxPath
 			continue
 		}
 		if l, ok := option.(*LayerOption); ok {
diff --git a/libcontainerd/types_windows.go b/libcontainerd/types_windows.go
@@ -39,10 +39,9 @@ type FlushOption struct {
 }
 
 // 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 {
-	IsHyperV    bool
-	SandboxPath string `json:",omitempty"`
+	IsHyperV bool
 }
 
 // LayerOption is a CreateOption that indicates to the runtime the layer folder

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,9 @@ type FlushOption struct {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// HyperVIsolationOption is a CreateOption that indicates whether the runtime`
`42`		`-// should start the container as a Hyper-V container, and if so, the sandbox path.`
	`42`	`+// should start the container as a Hyper-V container.`
`43`	`43`	`type HyperVIsolationOption struct {`
`44`		`- IsHyperV bool`
`45`		- SandboxPath string `json:",omitempty"`
	`44`	`+ IsHyperV bool`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`// LayerOption is a CreateOption that indicates to the runtime the layer folder`