diff --git a/api/swagger.yaml b/api/swagger.yaml index 9f1019681a..dc838222c5 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -560,7 +560,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -5466,7 +5466,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.25.yaml b/docs/api/v1.25.yaml index 6328960599..8b3e0e08fc 100644 --- a/docs/api/v1.25.yaml +++ b/docs/api/v1.25.yaml @@ -416,7 +416,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -2679,7 +2679,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.26.yaml b/docs/api/v1.26.yaml index 81e296177a..5e3f8bdf7f 100644 --- a/docs/api/v1.26.yaml +++ b/docs/api/v1.26.yaml @@ -417,7 +417,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -2684,7 +2684,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.27.yaml b/docs/api/v1.27.yaml index 29d8c6b106..65e7251ac2 100644 --- a/docs/api/v1.27.yaml +++ b/docs/api/v1.27.yaml @@ -1625,7 +1625,7 @@ definitions: Resources: type: "object" properties: - NanoCPUs: + NanoCpus: type: "integer" format: "int64" MemoryBytes: @@ -2744,7 +2744,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.28.yaml b/docs/api/v1.28.yaml index 3dcfb88198..69e3c39c99 100644 --- a/docs/api/v1.28.yaml +++ b/docs/api/v1.28.yaml @@ -427,7 +427,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -2834,7 +2834,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.29.yaml b/docs/api/v1.29.yaml index 1e92ab429d..d019c75354 100644 --- a/docs/api/v1.29.yaml +++ b/docs/api/v1.29.yaml @@ -431,7 +431,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -2868,7 +2868,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.30.yaml b/docs/api/v1.30.yaml index 2a071171a0..a361ca0c71 100644 --- a/docs/api/v1.30.yaml +++ b/docs/api/v1.30.yaml @@ -434,7 +434,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -3074,7 +3074,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.31.yaml b/docs/api/v1.31.yaml index e8a4eba4cf..f6eaf9ac5b 100644 --- a/docs/api/v1.31.yaml +++ b/docs/api/v1.31.yaml @@ -435,7 +435,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -3144,7 +3144,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.32.yaml b/docs/api/v1.32.yaml index 499b11ba90..30e59757f0 100644 --- a/docs/api/v1.32.yaml +++ b/docs/api/v1.32.yaml @@ -438,7 +438,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4387,7 +4387,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.33.yaml b/docs/api/v1.33.yaml index bf21ce97d8..61839254bf 100644 --- a/docs/api/v1.33.yaml +++ b/docs/api/v1.33.yaml @@ -443,7 +443,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4392,7 +4392,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.34.yaml b/docs/api/v1.34.yaml index 11ac297d0f..c81a4e4397 100644 --- a/docs/api/v1.34.yaml +++ b/docs/api/v1.34.yaml @@ -446,7 +446,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4421,7 +4421,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.35.yaml b/docs/api/v1.35.yaml index 0d78a41c40..43af829570 100644 --- a/docs/api/v1.35.yaml +++ b/docs/api/v1.35.yaml @@ -436,7 +436,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4403,7 +4403,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.36.yaml b/docs/api/v1.36.yaml index d381e3895a..91a5b3f48e 100644 --- a/docs/api/v1.36.yaml +++ b/docs/api/v1.36.yaml @@ -436,7 +436,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4416,7 +4416,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.37.yaml b/docs/api/v1.37.yaml index a4de19d8f5..8310ed70f4 100644 --- a/docs/api/v1.37.yaml +++ b/docs/api/v1.37.yaml @@ -436,7 +436,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4436,7 +4436,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.38.yaml b/docs/api/v1.38.yaml index b29439feac..45480c46f3 100644 --- a/docs/api/v1.38.yaml +++ b/docs/api/v1.38.yaml @@ -437,7 +437,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -4490,7 +4490,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.39.yaml b/docs/api/v1.39.yaml index ee017ea7a5..2bec7bf517 100644 --- a/docs/api/v1.39.yaml +++ b/docs/api/v1.39.yaml @@ -505,7 +505,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -5185,7 +5185,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.40.yaml b/docs/api/v1.40.yaml index 56a3e824d1..7c14ae0f83 100644 --- a/docs/api/v1.40.yaml +++ b/docs/api/v1.40.yaml @@ -554,7 +554,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -5308,7 +5308,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/v1.41.yaml b/docs/api/v1.41.yaml index 9f1019681a..dc838222c5 100644 --- a/docs/api/v1.41.yaml +++ b/docs/api/v1.41.yaml @@ -560,7 +560,7 @@ definitions: format: "int64" minimum: 0 maximum: 100 - NanoCPUs: + NanoCpus: description: "CPU quota in units of 10-9 CPUs." type: "integer" format: "int64" @@ -5466,7 +5466,7 @@ paths: MemorySwap: 0 MemoryReservation: 0 KernelMemory: 0 - NanoCPUs: 500000 + NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 CpuPeriod: 100000 diff --git a/docs/api/version-history.md b/docs/api/version-history.md index 26637bf16c..65d6145276 100644 --- a/docs/api/version-history.md +++ b/docs/api/version-history.md @@ -332,7 +332,7 @@ keywords: "API, Docker, rcli, REST, documentation" * `POST /services/create` and `POST /services/(id or name)/update` now accept a `rollback` value for `FailureAction`. * `POST /services/create` and `POST /services/(id or name)/update` now accept an optional `RollbackConfig` object which specifies rollback options. * `GET /services` now supports a `mode` filter to filter services based on the service mode (either `global` or `replicated`). -* `POST /containers/(name)/update` now supports updating `NanoCPUs` that represents CPU quota in units of 10-9 CPUs. +* `POST /containers/(name)/update` now supports updating `NanoCpus` that represents CPU quota in units of 10-9 CPUs. ## v1.27 API changes @@ -388,7 +388,7 @@ keywords: "API, Docker, rcli, REST, documentation" * The `hostConfig` option now accepts the fields `CpuRealtimePeriod` and `CpuRtRuntime` to allocate cpu runtime to rt tasks when `CONFIG_RT_GROUP_SCHED` is enabled in the kernel. * The `SecurityOptions` field within the `GET /info` response now includes `userns` if user namespaces are enabled in the daemon. * `GET /nodes` and `GET /node/(id or name)` now return `Addr` as part of a node's `Status`, which is the address that that node connects to the manager from. -* The `HostConfig` field now includes `NanoCPUs` that represents CPU quota in units of 10-9 CPUs. +* The `HostConfig` field now includes `NanoCpus` that represents CPU quota in units of 10-9 CPUs. * `GET /info` now returns more structured information about security options. * The `HostConfig` field now includes `CpuCount` that represents the number of CPUs available for execution by the container. Windows daemon only. * `POST /services/create` and `POST /services/(id or name)/update` now accept the `TTY` parameter, which allocate a pseudo-TTY in container.