Skip to content

Commit 2283e63

Browse files
author
John Howard
committed
Windows: Remove Sandbox, additional tweaks
Signed-off-by: John Howard <jhoward@microsoft.com>
1 parent 49b0a1f commit 2283e63

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

config-windows.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,12 @@ The following parameters can be specified:
148148

149149
* **`utilityvmpath`** *(string, OPTIONAL)* - specifies the path to the image used for the utility VM. This would be specified if using a base image which does not contain a utility VM image. If not supplied, the runtime will search the container filesystem layers from the bottom-most layer upwards, until it locates "UtilityVM", and default to that path.
150150

151-
* **`sandboxpath`** *(string, REQUIRED)* - specifies the root of the path to the sandbox to be used for the container.
152-
153151
### Example
154152

155153
```json
156154
"windows": {
157155
"hyperv": {
158-
"utilityvmpath": "C:\\\\path\\\\to\\utilityvm",
159-
"sandboxpath": "C:\\\\programdata\\\\docker\\\\windowsfilter
156+
"utilityvmpath": "C:\\path\\to\\utilityvm"
160157
}
161158
}
162159
```

config.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ For example, if a configuration is compliant with version 1.1 of this specificat
3131
* **`path`** (string, OPTIONAL) Specifies the path to the root filesystem for the container. The path is either an absolute path or a relative path to the bundle.
3232
Users SHOULD consider using a conventional name, such as `rootfs`.
3333

34-
On Windows, for Windows Server Containers, this field is REQUIRED. For Hyper-V Containers, this field MUST be omitted.
34+
On Windows, for Windows Server Containers, this field is REQUIRED and MUST be specified as a [volume GUID path][naming-a-volume]. For Hyper-V Containers, this field MUST be omitted.
3535

3636
On all other platforms, this field is REQUIRED.
3737

@@ -40,7 +40,7 @@ For example, if a configuration is compliant with version 1.1 of this specificat
4040
If defined, a directory MUST exist at the path declared by the field.
4141
* **`readonly`** (bool, OPTIONAL) If true then the root filesystem MUST be read-only inside the container, defaults to false. On Windows, this field must be omitted or false.
4242

43-
### Example
43+
### Example (POSIX)
4444

4545
```json
4646
"root": {
@@ -49,6 +49,14 @@ For example, if a configuration is compliant with version 1.1 of this specificat
4949
}
5050
```
5151

52+
### Example (Windows)
53+
54+
```json
55+
"root": {
56+
"path": "\\\\?\\Volume{ec84d99e-3f02-11e7-ac6c-00155d7682cf}\\"
57+
}
58+
```
59+
5260
## <a name="configMounts" />Mounts
5361

5462
**`mounts`** (array of objects, OPTIONAL) specifies additional mounts beyond [`root`](#root).
@@ -841,8 +849,7 @@ Here is a full example `config.json` for reference.
841849
[go-environment]: https://golang.org/doc/install/source#environment
842850
[ieee-1003.1-2001-xbd-c8.1]: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html#tag_08_01
843851
[ieee-1003.1-2001-xsh-exec]: http://pubs.opengroup.org/onlinepubs/009695399/functions/exec.html
844-
[mountvol]: http://ss64.com/nt/mountvol.html
845-
[set-volume-mountpoint]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365561(v=vs.85).aspx
852+
[naming-a-volume]: https://aka.ms/nb3hqb
846853

847854
[capabilities.7]: http://man7.org/linux/man-pages/man7/capabilities.7.html
848855
[mount.2]: http://man7.org/linux/man-pages/man2/mount.2.html

schema/config-windows.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@
9797
"utilityvmpath": {
9898
"id": "https://opencontainers.org/schema/bundle/windows/hyperv/utilityvmpath",
9999
"type": "string"
100-
},
101-
"sandboxpath": {
102-
"id": "https://opencontainers.org/schema/bundle/windows/hyperv/sandboxpath",
103-
"type": "string"
104100
}
105101
}
106102
}

specs-go/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,6 @@ type WindowsNetwork struct {
494494

495495
// WindowsHyperV contains information for configuring a container to run with Hyper-V isolation.
496496
type WindowsHyperV struct {
497-
// SandboxPath is a required host-path to the sandbox to be used by the container.
498-
SandboxPath string `json:"sandboxpath"`
499497
// UtilityVMPath is an optional path to the image used for the Utility VM.
500498
UtilityVMPath string `json:"utilityvmpath,omitempty"`
501499
}

0 commit comments

Comments
 (0)