Add Ulimits to ContainerSpec #2967
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #2967 +/- ##
==========================================
+ Coverage 61.75% 61.84% +0.08%
==========================================
Files 142 142
Lines 22999 23005 +6
==========================================
+ Hits 14204 14228 +24
+ Misses 7295 7278 -17
+ Partials 1500 1499 -1 |
thaJeztah
reviewed
Jul 26, 2020
api/specs.proto
Outdated
| @@ -358,8 +358,18 @@ message ContainerSpec { | |||
|
|
|||
| // CapabilityAdd sets the list of capabilities to add to the default capability list | |||
| repeated string capability_add = 27; | |||
| // CapabilityAdd sets the list of capabilities to drop from the default capability list | |||
| // CapabilityDrop sets the list of capabilities to drop from the default capability list | |||
There was a problem hiding this comment.
Whoops! looks like we missed this in #2965)
I guess the linter did not complain about this because it skips the generated .pb.go files 🤔
Could you perhaps create a separate PR for this change?
There was a problem hiding this comment.
I reverted the change here and created #2968 😉
Unlike Docker and docker-compose, Swarm never supported ulimits. This change introduces a new Ulimits field on the ContainerSpec type. It can be used by API clients to set desired ulimits. This is related to moby/moby#40639. Signed-off-by: Albin Kerouanton <albin@akerouanton.name>
|
This looks fine. Swarm is just plumbing this field down, and the hard work is all handled in the Engine. Nota bene, @akerouanton, that the |
akerouanton
added a commit
to akerouanton/docker
that referenced
this pull request
Jul 28, 2020
Includes moby/swarmkit#2967, which adds Ulimits to ContainerSpec. Signed-off-by: Albin Kerouanton <albin@akerouanton.name>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Jul 30, 2020
Includes moby/swarmkit#2967, which adds Ulimits to ContainerSpec. Signed-off-by: Albin Kerouanton <albin@akerouanton.name> Upstream-commit: 1fdb1033c4cecbd589fa6afa5b7a975bbaf712e4 Component: engine
This was referenced Dec 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
Unlike Docker and docker-compose, Swarm never supported ulimits.
This change introduces a new Ulimits field on the ContainerSpec type. It
can be used by API clients to set desired ulimits.
This is related to moby/moby#40639.
- How to test it
- Description for the changelog
Add Ulimits field to the API