Merge pull request #963 from hashicorp/d-driver-client-options

Clarify client options in drivers
This commit is contained in:
Alex Dadgar 2016-03-22 14:30:42 -07:00
commit c555905f1b
2 changed files with 18 additions and 6 deletions

View File

@ -244,7 +244,8 @@ of the Linux Kernel and Docker daemon.
## Agent Configuration
The `docker` driver has the following host-level configuration options:
The `docker` driver has the following [client configuration
options](/docs/agent/config.html#options):
* `docker.endpoint` - Defaults to `unix:///var/run/docker.sock`. You will need
to customize this if you use a non-standard socket (http or another
@ -291,6 +292,17 @@ Note: When testing or using the `-dev` flag you can use `DOCKER_HOST`,
`docker.endpoint` is set Nomad will **only** read client configuration from the
config filie.
An example is given below:
```
client {
options = {
"docker.cleanup.container" = "false"
"docker.cleanup.image" = "false"
}
}
```
## Agent Attributes
The `docker` driver will set the following client attributes:

View File

@ -72,14 +72,14 @@ To execute a binary downloaded from an [`artifact`](/docs/jobspec/index.html#art
The `raw_exec` driver can run on all supported operating systems. It is however
disabled by default. In order to be enabled, the Nomad client configuration must
explicitly enable the `raw_exec` driver in the client's
[options](../agent/config.html#options) field:
[options](/docs/agent/config.html#options) field:
```
client {
options = {
"driver.raw_exec.enable" = "1"
client {
options = {
"driver.raw_exec.enable" = "1"
}
}
}
```
## Client Attributes