From b3b7a91f6d5163c7ec65cf03dea18e4bc77b53e2 Mon Sep 17 00:00:00 2001 From: James Rasell Date: Fri, 14 Aug 2020 09:40:09 +0100 Subject: [PATCH 1/2] changelog: add entry for GH-8589. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de084bfa..5de2bc57c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: From 75f27326782d8064a0f70df2b9d3703e5b14bdf7 Mon Sep 17 00:00:00 2001 From: James Rasell Date: Fri, 14 Aug 2020 09:40:24 +0100 Subject: [PATCH 2/2] docs: update Docker driver to detail new image_pull_timeout params. --- website/pages/docs/drivers/docker.mdx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/website/pages/docs/drivers/docker.mdx b/website/pages/docs/drivers/docker.mdx index 1016f131f..4ddefbf84 100644 --- a/website/pages/docs/drivers/docker.mdx +++ b/website/pages/docs/drivers/docker.mdx @@ -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