Bump minimum required rkt version; update docs

Make section names match between docker and rkt
This commit is contained in:
Michael Schurter
2016-10-18 17:36:19 -07:00
committed by Michael Schurter
parent 3d828aad9c
commit f23cd482c7
4 changed files with 34 additions and 16 deletions

View File

@@ -315,7 +315,7 @@ Some networking modes like `container` or `none` will require coordination
outside of Nomad. First-class support for these options may be improved later
through Nomad plugins or dynamic job configuration.
## Host Requirements
## Client Requirements
Nomad requires Docker to be installed and running on the host alongside the
Nomad agent. Nomad was developed against Docker `1.8.2` and `1.9`.
@@ -333,7 +333,7 @@ user to the `docker` group so you can run Nomad without root:
For the best performance and security features you should use recent versions
of the Linux Kernel and Docker daemon.
## Agent Configuration
## Client Configuration
The `docker` driver has the following [client configuration
options](/docs/agent/config.html#options):
@@ -392,7 +392,7 @@ client {
}
```
## Agent Attributes
## Client Attributes
The `docker` driver will set the following client attributes:

View File

@@ -75,10 +75,15 @@ The `rkt` driver supports the following configuration in the job spec:
* `debug` - (Optional) Enable rkt command debug option.
## Task Directories
* `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
`rkt.volumes.enabled` option set to true.
The `rkt` driver currently does not support mounting of the `alloc/` and `local/` directories.
Once support is added, version `v0.10.0` or above of `rkt` will be required.
```hcl
config {
volumes = ["/path/on/host:/path/in/container"]
}
```
## Client Requirements
@@ -87,15 +92,24 @@ The `trust_prefix` must be accessible by the node running Nomad. This can be an
internal source, private to your cluster, but it must be reachable by the client
over HTTP.
## Client Configuration
The `rkt` driver has the following [client configuration
options](/docs/agent/config.html#options):
* `rkt.volumes.enabled`: Defaults to `false`. Allows tasks to bind host paths
(`volumes`) inside their container. Disabled by default as it removes the
isolation between containers' data.
## Client Attributes
The `rkt` driver will set the following client attributes:
* `driver.rkt` - Set to `1` if rkt is found on the host node. Nomad determines
this by executing `rkt version` on the host and parsing the output
* `driver.rkt.version` - Version of `rkt` eg: `0.8.1`. Note that the minimum required
version is `0.14.0`
* `driver.rkt.appc.version` - Version of `appc` that `rkt` is using eg: `0.8.1`
this by executing `rkt version` on the host and parsing the output
* `driver.rkt.version` - Version of `rkt` eg: `1.1.0`. Note that the minimum required
version is `1.0.0`
* `driver.rkt.appc.version` - Version of `appc` that `rkt` is using eg: `1.1.0`
Here is an example of using these properties in a job file:
@@ -105,7 +119,7 @@ job "docs" {
constraint {
attribute = "${driver.rkt.version}"
operator = ">"
value = "0.8"
value = "1.2"
}
}
```