From 2f038c25868727310992104b7b267fed6c7dad39 Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 24 May 2017 13:39:59 -0700 Subject: [PATCH] Windows: Remove unused SandboxPath Signed-off-by: John Howard --- daemon/start_windows.go | 4 ---- libcontainerd/client_windows.go | 3 --- libcontainerd/types_windows.go | 5 ++--- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/daemon/start_windows.go b/daemon/start_windows.go index 0f9739091a..6ec50d298c 100644 --- 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 index 3fe1e43172..b04bdbde9b 100644 --- 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 index cf4d640fa1..317bfb0209 100644 --- 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