beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix inconsistent fields for resource settings on service for API docs

Browse source 
In API docs, `CPU` and `Memory` were used for resource settings on
services. The actual settings should be `NanoCPUs` and `MemoryBytes`.

This fix address the inconsistent fields between API docs and actual
settings.

This fix fixes #24058.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-07-16 23:16:57 -07:00
parent caf8c75572
commit 0159ee1f5d
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/reference/api/docker_remote_api_v1.24.md
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`).

8
docs/reference/api/docker_remote_api_v1.25.md
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`).