Merge branch 'master' of github.com:hashicorp/nomad

client/task_runner.go

@@ -146,7 +146,13 @@ func (r *TaskRunner) RestoreState() error {
 	}
 
 	// Restore fields
-	r.task = snap.Task
+	if snap.Task == nil {
+		err := fmt.Errorf("task runner snapshot include nil Task")
+		r.logger.Printf("[ERR] client: %v", err)
+		return err
+	} else {
+		r.task = snap.Task
+	}
 	r.artifactsDownloaded = snap.ArtifactDownloaded
 
 	if err := r.setTaskEnv(); err != nil {

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

@@ -209,7 +209,12 @@ If you prefer to use the traditional port-mapping method, you can specify the
 task "redis" {
     driver = "docker"
 
-    port "redis" {}
+    resources {
+        network {
+            mbits = 20
+            port "redis" {}
+        }
+    }
 
     config {
       image = "redis"