From c081fdc449e6585d1ad503daf0077176a0a50254 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 8 Feb 2018 20:20:26 -0800 Subject: [PATCH] docker: add cpu_hard_limit docs --- CHANGELOG.md | 1 + website/source/docs/drivers/docker.html.md | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3077c6977..de628047a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ IMPROVEMENTS: [[GH-3781](https://github.com/hashicorp/nomad/issues/3781)] * discovery: Allow `check_restart` to be specified in the `service` stanza. [[GH-3718](https://github.com/hashicorp/nomad/issues/3718)] + * driver/docker: Support hard CPU limits [[GH-3825](https://github.com/hashicorp/nomad/issues/3825)] * driver/docker: Support advertising IPv6 addresses [[GH-3790](https://github.com/hashicorp/nomad/issues/3790)] * driver/docker; Support overriding image entrypoint [[GH-3788](https://github.com/hashicorp/nomad/issues/3788)] * driver/docker: Support adding or dropping capabilities [[GH-3754](https://github.com/hashicorp/nomad/issues/3754)] diff --git a/website/source/docs/drivers/docker.html.md b/website/source/docs/drivers/docker.html.md index 99ef6de58..e20667bf2 100644 --- a/website/source/docs/drivers/docker.html.md +++ b/website/source/docs/drivers/docker.html.md @@ -355,6 +355,12 @@ The `docker` driver supports the following configuration in the job spec. Only ] } ``` + +* `cpu_hard_limit` - (Optional) `true` or `false` (default). Use hard CPU + limiting instead of soft limiting. By default this is `false` which means + soft limiting is used and containers are able to burst above their CPU limit + when there is idle capacity. + * `advertise_ipv6_address` - (Optional) `true` or `false` (default). Use the container's IPv6 address (GlobalIPv6Address in Docker) when registering services and checks. See [IPv6 Docker containers](/docs/job-specification/service.html#IPv6 Docker containers) for details.