Add capabilities list to container specification

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
moby · Dec 16, 2018 · 993b4bc · 993b4bc
1 parent 9afd76b
commit 993b4bc
Show file tree

Hide file tree

Showing 6 changed files with 284 additions and 137 deletions.
diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go
@@ -209,6 +209,7 @@ func (c *containerConfig) hostConfig() *enginecontainer.HostConfig {
 		PortBindings: c.portBindings(),
 		Init:         c.init(),
 		Isolation:    c.isolation(),
+		Capabilities: c.spec().Capabilities,
 	}
 
 	// The format of extra hosts on swarmkit is specified in:

diff --git a/api/api.pb.txt b/api/api.pb.txt
@@ -4919,6 +4919,13 @@ file {
       type_name: ".google.protobuf.Int64Value"
       json_name: "memorySwappiness"
     }
+    field {
+      name: "capabilities"
+      number: 29
+      label: LABEL_REPEATED
+      type: TYPE_STRING
+      json_name: "capabilities"
+    }
     nested_type {
       name: "LabelsEntry"
       field {