Merge branch 'master' into study/aws-ecr-1

website/source/docs/agent/config.html.md

@@ -389,7 +389,6 @@ via CLI arguments. The `agent` command accepts the following arguments:
 * `-node=<name>`: Equivalent to the [name](#name) config option.
 * `-node-class=<class>`: Equivalent to the Client [node_class](#node_class)
   config option.
-* `-node-id=<uuid>`: Equivalent to the Client [node_id](#node_id) config option.
 * `-region=<region>`: Equivalent to the [region](#region) config option.
 * `-rejoin`: Equivalent to the [rejoin_after_leave](#rejoin_after_leave) config option.
 * `-retry-interval`: Equivalent to the [retry_interval](#retry_interval) config option.

website/source/docs/commands/node-status.html.md.erb

@@ -35,6 +35,7 @@ Otherwise, a list of matching nodes and information will be displayed.
 * `-short`: Display short output. Used only when querying a single node. Drops
   verbose information about node allocations.
 * `-verbose`: Show full information.
+* `-allocs`: Show running allocations per node
 
 ## Examples
 
@@ -47,6 +48,15 @@ a72dfba2  dc1  node1  false  ready
 1f3f03ea  dc1  node2  false  ready
 ```
 
+List view, with running allocations:
+
+```
+$ nomad node-status -allocs
+ID        DC   Name   Class   Drain  Status  Running Allocs
+4d2ba53b  dc1  node1  <none>  false  ready   1
+34dfba32  dc1  node2  <none>  false  ready   3
+```
+
 Single-node view in short mode:
 
 ```

website/source/docs/drivers/exec.html.md

@@ -52,6 +52,10 @@ You must specify a `command` to be executed. Optionally you can specify an
 `artifact_source` to be downloaded as well. Any `command` is assumed to be present on the 
 running client, or a downloaded artifact.
 
+If you are receiving the error `* Constraint "missing drivers" filtered <> nodes`
+and using the exec driver, check to ensure that you are running Nomad as root. This
+also applies for running Nomad in -dev mode.
+
 ## Examples
 
 To run a binary present on the Node:

website/source/docs/http/system.html.md

@@ -21,7 +21,7 @@ region can be specified using the `?region=` query parameter.
   </dd>
 
   <dt>Method</dt>
-  <dd>GET</dd>
+  <dd>PUT</dd>
 
   <dt>URL</dt>
   <dd>`/v1/system/gc`</dd>

website/source/docs/jobspec/environment.html.md

@@ -13,6 +13,62 @@ when they start. Other settings are dynamically allocated when your job is
 scheduled. Both types of values are made available to your job through
 environment variables.
 
+## Summary
+
+<table class="table table-bordered table-striped">
+  <tr>
+    <th>Variable</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>NOMAD_ALLOC_DIR</td>
+    <td>Path to the shared alloc directory</td>
+  </tr>
+  <tr>
+    <td>NOMAD_TASK_DIR</td>
+    <td>Path to the local task directory</td>
+  </tr>
+  <tr>
+    <td>NOMAD_MEMORY_LIMIT</td>
+    <td>The task's memory limit in MB</td>
+  </tr>
+  <tr>
+    <td>NOMAD_CPU_LIMIT</td>
+    <td>The task's CPU limit in MHz</td>
+  </tr>
+  <tr>
+    <td>NOMAD_ALLOC_ID</td>
+    <td>The allocation ID of the task</td>
+  </tr>
+  <tr>
+    <td>NOMAD_ALLOC_NAME</td>
+    <td>The allocation name of the task</td>
+  </tr>
+  <tr>
+    <td>NOMAD_TASK_NAME</td>
+    <td>The task's name</td>
+  </tr>
+  <tr>
+    <td>NOMAD_ADDR_\<label\></td>
+    <td>The IP:Port pair of the the port with the given label</td>
+  </tr>
+  <tr>
+    <td>NOMAD_HOST_PORT_\<label\></td>
+    <td>The host port for the given label if the port is port mapped</td>
+  </tr>
+  <tr>
+    <td>NOMAD_META_\<key\></td>
+    <td>The metadata of the task</td>
+  </tr>
+</table>
+
+## Task Identifiers
+
+Nomad will pass both the allocation ID and name as well as the task's
+name. These are given as `NOMAD_ALLOC_ID`, `NOMAD_ALLOC_NAME`,
+`NOMAD_TASK_NAME`. The allocation ID and name can be useful when the task being
+run needs a unique identifier or to know its instance count.
+
 ## Resources
 
 When you request resources for a job, Nomad creates a resource offer. The final

website/source/docs/jobspec/interpreted.html.md

@@ -83,7 +83,7 @@ driver.
     <td>The client node class</td>
   </tr>
   <tr>
-    <td>${attr.\<key\}></td>
+    <td>${attr.\<key\>}</td>
     <td>The attribute given by `key` on the client node.</td>
   </tr>
   <tr>