kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #21364 from thaJeztah/carry-21188-fix-docker-info-docs

Browse source 
docs: fix incorrect output for "/info" endpoint
This commit is contained in:
Sebastiaan van Stijn 2016-03-21 13:38:35 +01:00
commit c9488fe280
3 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/reference/api/docker_remote_api_v1.21.md
View file

@ -1921,11 +1921,11 @@ Display system-wide information
Content-Type: application/json Content-Type: application/json
{ {
"ClusterStore": "etcd://localhost:2379",
"Containers": 11, "Containers": 11,
"CpuCfsPeriod": true, "CpuCfsPeriod": true,
"CpuCfsQuota": true, "CpuCfsQuota": true,
"Debug": false, "Debug": false,
"DiscoveryBackend": "etcd://localhost:2379",
"DockerRootDir": "/var/lib/docker", "DockerRootDir": "/var/lib/docker",
"Driver": "btrfs", "Driver": "btrfs",
"DriverStatus": [[""]], "DriverStatus": [[""]],
@ -1966,9 +1966,9 @@ Display system-wide information
"127.0.0.0/8" "127.0.0.0/8"
] ]
}, },
"ServerVersion": "1.9.0",
"SwapLimit": false, "SwapLimit": false,
"SystemTime": "2015-03-10T11:11:23.730591467-07:00" "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
"ServerVersion": "1.9.0"
} }
Status Codes: Status Codes:
@ -2796,7 +2796,7 @@ JSON Parameters:
`POST /networks/(id)/connect` `POST /networks/(id)/connect`
Connects a container to a network Connect a container to a network
**Example request**: **Example request**:
@ -2827,7 +2827,7 @@ JSON Parameters:
`POST /networks/(id)/disconnect` `POST /networks/(id)/disconnect`
Disconnects a container from a network Disconnect a container from a network
**Example request**: **Example request**:

31
docs/reference/api/docker_remote_api_v1.22.md
View file

@ -2133,6 +2133,7 @@ Display system-wide information
{ {
"Architecture": "x86_64", "Architecture": "x86_64",
"ClusterStore": "etcd://localhost:2379",
"Containers": 11, "Containers": 11,
"ContainersRunning": 7, "ContainersRunning": 7,
"ContainersStopped": 3, "ContainersStopped": 3,
@ -2140,21 +2141,9 @@ Display system-wide information
"CpuCfsPeriod": true, "CpuCfsPeriod": true,
"CpuCfsQuota": true, "CpuCfsQuota": true,
"Debug": false, "Debug": false,
"DiscoveryBackend": "etcd://localhost:2379",
"DockerRootDir": "/var/lib/docker", "DockerRootDir": "/var/lib/docker",
"Driver": "btrfs", "Driver": "btrfs",
"DriverStatus": [[""]], "DriverStatus": [[""]],
"SystemStatus": [["State", "Healthy"]],
"Plugins": {
"Volume": [
"local"
],
"Network": [
"null",
"host",
"bridge"
]
},
"ExecutionDriver": "native-0.1", "ExecutionDriver": "native-0.1",
"ExperimentalBuild": false, "ExperimentalBuild": false,
"HttpProxy": "http://test:test@localhost:8080", "HttpProxy": "http://test:test@localhost:8080",
@ -2179,8 +2168,17 @@ Display system-wide information
"NoProxy": "9.81.1.160", "NoProxy": "9.81.1.160",
"OomKillDisable": true, "OomKillDisable": true,
"OSType": "linux", "OSType": "linux",
"OomScoreAdj": 500,
"OperatingSystem": "Boot2Docker", "OperatingSystem": "Boot2Docker",
"Plugins": {
"Volume": [
"local"
],
"Network": [
"null",
"host",
"bridge"
]
},
"RegistryConfig": { "RegistryConfig": {
"IndexConfigs": { "IndexConfigs": {
"docker.io": { "docker.io": {
@ -2194,9 +2192,10 @@ Display system-wide information
"127.0.0.0/8" "127.0.0.0/8"
] ]
}, },
"ServerVersion": "1.9.0",
"SwapLimit": false, "SwapLimit": false,
"SystemStatus": [["State", "Healthy"]],
"SystemTime": "2015-03-10T11:11:23.730591467-07:00" "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
"ServerVersion": "1.9.0"
} }
Status Codes: Status Codes:
@ -3089,7 +3088,7 @@ JSON Parameters:
`POST /networks/(id)/connect` `POST /networks/(id)/connect`
Connects a container to a network Connect a container to a network
**Example request**: **Example request**:
@ -3126,7 +3125,7 @@ JSON Parameters:
`POST /networks/(id)/disconnect` `POST /networks/(id)/disconnect`
Disconnects a container from a network Disconnect a container from a network
**Example request**: **Example request**:

27
docs/reference/api/docker_remote_api_v1.23.md
View file

@ -2167,6 +2167,7 @@ Display system-wide information
{ {
"Architecture": "x86_64", "Architecture": "x86_64",
"ClusterStore": "etcd://localhost:2379",
"CgroupDriver": "cgroupfs", "CgroupDriver": "cgroupfs",
"Containers": 11, "Containers": 11,
"ContainersRunning": 7, "ContainersRunning": 7,
@ -2175,21 +2176,9 @@ Display system-wide information
"CpuCfsPeriod": true, "CpuCfsPeriod": true,
"CpuCfsQuota": true, "CpuCfsQuota": true,
"Debug": false, "Debug": false,
"DiscoveryBackend": "etcd://localhost:2379",
"DockerRootDir": "/var/lib/docker", "DockerRootDir": "/var/lib/docker",
"Driver": "btrfs", "Driver": "btrfs",
"DriverStatus": [[""]], "DriverStatus": [[""]],
"SystemStatus": [["State", "Healthy"]],
"Plugins": {
"Volume": [
"local"
],
"Network": [
"null",
"host",
"bridge"
]
},
"ExecutionDriver": "native-0.1", "ExecutionDriver": "native-0.1",
"ExperimentalBuild": false, "ExperimentalBuild": false,
"HttpProxy": "http://test:test@localhost:8080", "HttpProxy": "http://test:test@localhost:8080",
@ -2215,8 +2204,17 @@ Display system-wide information
"NoProxy": "9.81.1.160", "NoProxy": "9.81.1.160",
"OomKillDisable": true, "OomKillDisable": true,
"OSType": "linux", "OSType": "linux",
"OomScoreAdj": 500,
"OperatingSystem": "Boot2Docker", "OperatingSystem": "Boot2Docker",
"Plugins": {
"Volume": [
"local"
],
"Network": [
"null",
"host",
"bridge"
]
},
"RegistryConfig": { "RegistryConfig": {
"IndexConfigs": { "IndexConfigs": {
"docker.io": { "docker.io": {
@ -2230,9 +2228,10 @@ Display system-wide information
"127.0.0.0/8" "127.0.0.0/8"
] ]
}, },
"ServerVersion": "1.9.0",
"SwapLimit": false, "SwapLimit": false,
"SystemStatus": [["State", "Healthy"]],
"SystemTime": "2015-03-10T11:11:23.730591467-07:00" "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
"ServerVersion": "1.9.0"
} }
Status Codes: Status Codes: