luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix docker docs; add volumes/logging to changelog

This commit is contained in:
Michael Schurter 2016-10-07 12:28:42 -07:00
parent d8f8048d85
commit f0173b361f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -8,6 +8,8 @@ IMPROVEMENTS:
* client: Enforce shared allocation directory disk usage [GH-1580] * client: Enforce shared allocation directory disk usage [GH-1580]
* client: Introduce a `secrets/` directory to tasks where sensitive data can * client: Introduce a `secrets/` directory to tasks where sensitive data can
be written [GH-1681] be written [GH-1681]
* driver/docker: Support Docker volumes [GH-1767]
* driver/docker: Allow Docker logging to be configured [GH-1767]
BUG FIXES: BUG FIXES:
* client: Prevent race when persisting state file [GH-1682] * client: Prevent race when persisting state file [GH-1682]

18
website/source/docs/drivers/docker.html.md
View File

@ -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. * `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 * `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 host paths to container paths. Can only be run on clients with the
`docker.volumes.enabled` option set to true. `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. * `work_dir` - (Optional) The working directory inside the container.
### Container Name ### Container Name