Add isolation to info

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c4e169727474f24cb0eddea15b94aaa2bfbb3281
Component: engine
This commit is contained in:
John Howard
2016-09-23 12:13:29 -07:00
parent 93e3695b69
commit a034d841ce
8 changed files with 150 additions and 1 deletions
@@ -116,6 +116,7 @@ This section lists each version from latest to oldest. Each listing includes a
[Docker Remote API v1.25](docker_remote_api_v1.25.md) documentation
* `GET /info` now returns `Isolation`.
* `POST /containers/create` now takes `AutoRemove` in HostConfig, to enable auto-removal of the container on daemon side when the container's process exits.
* `GET /containers/json` and `GET /containers/(id or name)/json` now return `"removing"` as a value for the `State.Status` field if the container is being removed. Previously, "exited" was returned as status.
* `GET /containers/json` now accepts `removing` as a valid value for the `status` filter.
@@ -2221,7 +2221,7 @@ Display system-wide information
GET /info HTTP/1.1
**Example response**:
**Example response (Linux)**:
HTTP/1.1 200 OK
Content-Type: application/json
@@ -2299,6 +2299,109 @@ Display system-wide information
"SystemTime": "2015-03-10T11:11:23.730591467-07:00"
}
**Example response (Windows)**:
HTTP/1.1 200 OK
Content-Type: application/json
{
"ID": "NYMS:B5VK:UMSL:FVDZ:EWB5:FKVK:LPFL:FJMQ:H6FT:BZJ6:L2TD:XH62",
"Containers": 1,
"ContainersRunning": 0,
"ContainersPaused": 0,
"ContainersStopped": 1,
"Images": 17,
"Driver": "windowsfilter",
"DriverStatus": [
["Windows", ""]
],
"SystemStatus": null,
"Plugins": {
"Volume": ["local"],
"Network": ["nat", "null", "overlay"],
"Authorization": null
},
"MemoryLimit": false,
"SwapLimit": false,
"KernelMemory": false,
"CpuCfsPeriod": false,
"CpuCfsQuota": false,
"CPUShares": false,
"CPUSet": false,
"IPv4Forwarding": true,
"BridgeNfIptables": true,
"BridgeNfIp6tables": true,
"Debug": false,
"NFd": -1,
"OomKillDisable": false,
"NGoroutines": 11,
"SystemTime": "2016-09-23T11:59:58.9843533-07:00",
"LoggingDriver": "json-file",
"CgroupDriver": "",
"NEventsListener": 0,
"KernelVersion": "10.0 14393 (14393.206.amd64fre.rs1_release.160912-1937)",
"OperatingSystem": "Windows Server 2016 Datacenter",
"OSType": "windows",
"Architecture": "x86_64",
"IndexServerAddress": "https://index.docker.io/v1/",
"RegistryConfig": {
"InsecureRegistryCIDRs": ["127.0.0.0/8"],
"IndexConfigs": {
"docker.io": {
"Name": "docker.io",
"Mirrors": null,
"Secure": true,
"Official": true
}
},
"Mirrors": null
},
"NCPU": 8,
"MemTotal": 4293828608,
"DockerRootDir": "C:\\control",
"HttpProxy": "",
"HttpsProxy": "",
"NoProxy": "",
"Name": "WIN-V0V70C0LU5P",
"Labels": null,
"ExperimentalBuild": false,
"ServerVersion": "1.13.0-dev",
"ClusterStore": "",
"ClusterAdvertise": "",
"SecurityOptions": null,
"Runtimes": null,
"DefaultRuntime": "",
"Swarm": {
"NodeID": "",
"NodeAddr": "",
"LocalNodeState": "inactive",
"ControlAvailable": false,
"Error": "",
"RemoteManagers": null,
"Nodes": 0,
"Managers": 0,
"Cluster": {
"ID": "",
"Version": {},
"CreatedAt": "0001-01-01T00:00:00Z",
"UpdatedAt": "0001-01-01T00:00:00Z",
"Spec": {
"Orchestration": {},
"Raft": {
"ElectionTick": 0,
"HeartbeatTick": 0
},
"Dispatcher": {},
"CAConfig": {},
"TaskDefaults": {}
}
}
},
"LiveRestoreEnabled": false,
"Isolation": "process"
}
**Status codes**:
- **200** – no error
@@ -154,3 +154,36 @@ You can also specify the output format:
$ docker info --format '{{json .}}'
{"ID":"I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S","Containers":14, ...}
Here is a sample output for a daemon running on Windows Server 2016:
E:\docker>docker info
Containers: 1
Running: 0
Paused: 0
Stopped: 1
Images: 17
Server Version: 1.13.0-dev
Storage Driver: windowsfilter
Windows:
Logging Driver: json-file
Plugins:
Volume: local
Network: nat null overlay
Swarm: inactive
Default Isolation: process
Kernel Version: 10.0 14393 (14393.206.amd64fre.rs1_release.160912-1937)
Operating System: Windows Server 2016 Datacenter
OSType: windows
Architecture: x86_64
CPUs: 8
Total Memory: 3.999 GiB
Name: WIN-V0V70C0LU5P
ID: NYMS:B5VK:UMSL:FVDZ:EWB5:FKVK:LPFL:FJMQ:H6FT:BZJ6:L2TD:XH62
Docker Root Dir: C:\control
Debug Mode (client): false
Debug Mode (server): false
Registry: https://index.docker.io/v1/
Insecure Registries:
127.0.0.0/8
Live Restore Enabled: false