Fix docker docs; add volumes/logging to changelog
This commit is contained in:
parent
d8f8048d85
commit
f0173b361f
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue