toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24729 from yongtang/24058-api-docs-resource-settings

Browse Source 
Fix inconsistent fields for resource settings on service for API docs
Upstream-commit: 4ced001d9aff60dea2c2687c0635cdbe369cd534
Component: engine
This commit is contained in:
Vincent Demeester
2016-07-18 10:20:20 +02:00
committed by GitHub
parent a95455fc68 0ad86942d1
commit e904347c82
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/docs/reference/api/docker_remote_api_v1.24.md
+4 -4
View File
@@ -4006,11 +4006,11 @@ JSON Parameters:
- **Resources** – Resource requirements which apply to each individual container created as part
of the service.
- **Limits** – Define resources limits.
- **CPU** – CPU limit
- **Memory** – Memory limit
- **NanoCPUs** – CPU limit in units of 10<sup>-9</sup> CPU shares.
- **MemoryBytes** – Memory limit in Bytes.
- **Reservation** – Define resources reservation.
- **CPU** – CPU reservation
- **Memory** – Memory reservation
- **NanoCPUs** – CPU reservation in units of 10<sup>-9</sup> CPU shares.
- **MemoryBytes** – Memory reservation in Bytes.
- **RestartPolicy** – Specification for the restart policy which applies to containers created
as part of this service.
- **Condition** – Condition for restart (`none`, `on-failure`, or `any`).
components/engine/docs/reference/api/docker_remote_api_v1.25.md
+4 -4
View File
@@ -4007,11 +4007,11 @@ JSON Parameters:
- **Resources** – Resource requirements which apply to each individual container created as part
of the service.
- **Limits** – Define resources limits.
- **CPU** – CPU limit
- **Memory** – Memory limit
- **NanoCPUs** – CPU limit in units of 10<sup>-9</sup> CPU shares.
- **MemoryBytes** – Memory limit in Bytes.
- **Reservation** – Define resources reservation.
- **CPU** – CPU reservation
- **Memory** – Memory reservation
- **NanoCPUs** – CPU reservation in units of 10<sup>-9</sup> CPU shares.
- **MemoryBytes** – Memory reservation in Bytes.
- **RestartPolicy** – Specification for the restart policy which applies to containers created
as part of this service.
- **Condition** – Condition for restart (`none`, `on-failure`, or `any`).