From f0173b361f88a6db211450065ee929e5eeb9a706 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 7 Oct 2016 12:28:42 -0700 Subject: [PATCH] Fix docker docs; add volumes/logging to changelog --- CHANGELOG.md | 2 ++ website/source/docs/drivers/docker.html.md | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5c54369a..72b40f3d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ IMPROVEMENTS: * client: Enforce shared allocation directory disk usage [GH-1580] * client: Introduce a `secrets/` directory to tasks where sensitive data can be written [GH-1681] + * driver/docker: Support Docker volumes [GH-1767] + * driver/docker: Allow Docker logging to be configured [GH-1767] BUG FIXES: * client: Prevent race when persisting state file [GH-1682] diff --git a/website/source/docs/drivers/docker.html.md b/website/source/docs/drivers/docker.html.md index fef8aac94..af59766c3 100644 --- a/website/source/docs/drivers/docker.html.md +++ b/website/source/docs/drivers/docker.html.md @@ -137,14 +137,24 @@ The `docker` driver supports the following configuration in the job spec: * `shm_size` - (Optional) The size (bytes) of /dev/shm for the container. +* `logging` - (Optional) A key/value map of Docker logging options. The default + value is `syslog`. + + ```hcl + config { + logging { + type = "fluentd" + config { + fluentd-address = "localhost:24224" + } + } + } + ``` + * `volumes` - (Optional) A list of `host_path:container_path` strings to bind host paths to container paths. Can only be run on clients with the `docker.volumes.enabled` option set to true. -* `volumes_from` - (Optional) A list of volumes to inherit from another - container. Can only be run on clients with the `docker.volumes.enabled` - option set to true. - * `work_dir` - (Optional) The working directory inside the container. ### Container Name