Merge pull request #8672 from hashicorp/f-gh-8142-docs

docs: update docs to reference new Docker driver image_pull_timeout params.
This commit is contained in:
James Rasell 2020-08-14 16:08:18 +02:00 committed by GitHub
commit c90a2da3ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View file

@ -1,5 +1,9 @@
## 0.12.4 (Unreleased)
IMPROVEMENTS:
* driver/docker: Allow configurable image pull context timeout setting. [[GH-5718](https://github.com/hashicorp/nomad/issues/5718)]
## 0.12.3 (August 13, 2020)
BUG FIXES:

View file

@ -44,6 +44,10 @@ The `docker` driver supports the following configuration in the job spec. Only
}
```
- `image_pull_timeout` - (Optional) A time duration that controls how long Nomad
will wait before cancelling an in-progress pull of the Docker image as specified
in `image`. Defaults to `"5m"`.
- `args` - (Optional) A list of arguments to the optional `command`. If no
`command` is specified, the arguments are passed directly to the container.
References to environment variables or any [interpretable Nomad
@ -823,6 +827,10 @@ plugin "docker" {
container necessary when sharing network namespaces between tasks. Defaults
to "gcr.io/google_containers/pause-amd64:3.0".
- `infra_image_pull_timeout` - A time duration that controls how long Nomad will
wait before cancelling an in-progress pull of the Docker image as specified in
`infra_image`. Defaults to `"5m"`.
## Client Configuration
~> Note: client configuration options will soon be deprecated. Please use