1. docker
  2. Commit 2f038c25868727310992104b7b267fed6c7dad39
Browse code

Windows: Remove unused SandboxPath

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2017/05/25 05:39:59
Showing 3 changed files
daemon/start_windows.go
History View file @ 2f038c2
... ... 
@@ -45,10 +45,6 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
45 45 
 	if err != nil {
46 46 
 		return nil, fmt.Errorf("failed to get layer metadata - %s", err)
47 47 
 	}
48 
-	if hvOpts.IsHyperV {
49 
-		hvOpts.SandboxPath = filepath.Dir(m["dir"])
50 
-	}
51 
-
52 48 
 	layerOpts.LayerFolderPath = m["dir"]
53 49
54 50 
 	// Generate the layer paths of the layer options
libcontainerd/client_windows.go
History View file @ 2f038c2
... ... 
@@ -49,7 +49,6 @@ const defaultOwner = "docker"
49 49 
 // | VolumePath      | \\?\\Volume{GUIDa}                         |                                                   |
50 50 
 // | LayerFolderPath | %root%\windowsfilter\containerID           | %root%\windowsfilter\containerID (servicing only) |
51 51 
 // | Layers[]        | ID=GUIDb;Path=%root%\windowsfilter\layerID | ID=GUIDb;Path=%root%\windowsfilter\layerID        |
52 
-// | SandboxPath     |                                            | %root%\windowsfilter                              |
53 52 
 // | HvRuntime       |                                            | ImagePath=%root%\BaseLayerID\UtilityVM            |
54 53 
 // +-----------------+--------------------------------------------+---------------------------------------------------+
55 54 
 //
... ... 
@@ -88,7 +87,6 @@ const defaultOwner = "docker"
88 88 
 //	}],
89 89 
 //	"HostName": "475c2c58933b",
90 90 
 //	"MappedDirectories": [],
91 
-//	"SandboxPath": "C:\\\\control\\\\windowsfilter",
92 91 
 //	"HvPartition": true,
93 92 
 //	"EndpointList": ["e1bb1e61-d56f-405e-b75d-fd520cefa0cb"],
94 93 
 //	"DNSSearchList": "a.com,b.com,c.com",
... ... 
@@ -159,7 +157,6 @@ func (clnt *client) Create(containerID string, checkpoint string, checkpointDir
159 159 
 		}
160 160 
 		if h, ok := option.(*HyperVIsolationOption); ok {
161 161 
 			configuration.HvPartition = h.IsHyperV
162 
-			configuration.SandboxPath = h.SandboxPath
163 162 
 			continue
164 163 
 		}
165 164 
 		if l, ok := option.(*LayerOption); ok {
libcontainerd/types_windows.go
History View file @ 2f038c2
... ... 
@@ -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