diff --git a/api/api.pb.txt b/api/api.pb.txt index 2cf98a615..a77d1a896 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -11698,21 +11698,6 @@ file { weak_dependency: 2 syntax: "proto3" } -file { - name: "github.com/docker/swarmkit/api/test.proto" - package: "docker.swarmkit.v1" - message_type { - name: "TestService" - field { - name: "TestService" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "TestService" - } - } - syntax: "proto3" -} file { name: "github.com/docker/swarmkit/api/watch.proto" package: "docker.swarmkit.v1" diff --git a/api/specs.pb.go b/api/specs.pb.go index a12741879..959749c9f 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -874,8 +874,10 @@ type ContainerSpec struct { CapabilityDrop []string `protobuf:"bytes,28,rep,name=capability_drop,json=capabilityDrop,proto3" json:"capability_drop,omitempty"` // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. - Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` - OomScoreAdj int64 `protobuf:"varint,30,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` + Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` + // OOmScoreAdj defines the relative value used for destroying a container during an OOM + // Values are between -1000 and 1000 + OomScoreAdj int64 `protobuf:"varint,30,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } diff --git a/api/specs.proto b/api/specs.proto index a59d566dd..c1aeaccf7 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -372,7 +372,8 @@ message ContainerSpec { // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. repeated Ulimit ulimits = 29; - + // OOmScoreAdj defines the relative value used for destroying a container during an OOM + // Values are between -1000 and 1000 int64 oom_score_adj = 30; } diff --git a/api/types.proto b/api/types.proto index 1f85ad3b8..74f5c7135 100644 --- a/api/types.proto +++ b/api/types.proto @@ -80,7 +80,6 @@ message ResourceRequirements { Resources limits = 1; Resources reservations = 2; - // Amount of swap in bytes - can only be used together with a memory limit // -1 means unlimited // a null pointer indicates that the default behaviour of granting twice