moby
diff --git a/‎agent/exec/dockerapi/container.go‎
Lines changed: 6 additions & 0 deletions b/‎agent/exec/dockerapi/container.go‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎agent/exec/dockerapi/container_test.go‎
Lines changed: 20 additions & 0 deletions b/‎agent/exec/dockerapi/container_test.go‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎api/api.pb.txt‎
Lines changed: 7 additions & 15 deletions b/‎api/api.pb.txt‎
Lines changed: 7 additions & 15 deletions
@@ -423,6 +423,12 @@ func (c *containerConfig) volumeCreateRequest(mount *api.Mount) *volume.VolumesC
 func (c *containerConfig) resources() enginecontainer.Resources {
 	resources := enginecontainer.Resources{}
 
+	// set pids limit
+	pidsLimit := c.spec().PidsLimit
+	if pidsLimit > 0 {
+		resources.PidsLimit = pidsLimit
+	}
+
 	// If no limits are specified let the engine use its defaults.
 	//
 	// TODO(aluzzardi): We might want to set some limits anyway otherwise
 
@@ -135,6 +135,26 @@ func TestExtraHosts(t *testing.T) {
 	}
 }
 
+func TestPidLimit(t *testing.T) {
+	c := containerConfig{
+		task: &api.Task{
+			Spec: api.TaskSpec{Runtime: &api.TaskSpec_Container{
+				Container: &api.ContainerSpec{
+					PidsLimit: 10,
+				},
+			}},
+		},
+	}
+
+	hostConfig := c.hostConfig()
+	expected := int64(10)
+	actual := hostConfig.PidsLimit
+
+	if expected != actual {
+		t.Fatalf("expected %d, got %d", expected, actual)
+	}
+}
+
 func TestStopSignal(t *testing.T) {
 	c := containerConfig{
 		task: &api.Task{
 
@@ -710,13 +710,6 @@ file {
       type: TYPE_STRING
       json_name: "swiftPrefix"
     }
-    field {
-      name: "php_class_prefix"
-      number: 40
-      label: LABEL_OPTIONAL
-      type: TYPE_STRING
-      json_name: "phpClassPrefix"
-    }
     field {
       name: "uninterpreted_option"
       number: 999
@@ -798,10 +791,6 @@ file {
       start: 8
       end: 9
     }
-    reserved_range {
-      start: 9
-      end: 10
-    }
   }
   message_type {
     name: "FieldOptions"
@@ -945,10 +934,6 @@ file {
       start: 1000
       end: 536870912
     }
-    reserved_range {
-      start: 5
-      end: 6
-    }
   }
   message_type {
     name: "EnumValueOptions"
@@ -4751,6 +4736,13 @@ file {
       type_name: ".docker.swarmkit.v1.ContainerSpec.Isolation"
       json_name: "isolation"
     }
+    field {
+      name: "pidsLimit"
+      number: 25
+      label: LABEL_OPTIONAL
+      type: TYPE_INT64
+      json_name: "pidsLimit"
+    }
     nested_type {
       name: "LabelsEntry"
       field {