-
Notifications
You must be signed in to change notification settings - Fork 18.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add support to set MemorySwap #9603
Conversation
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Why wouldn't you send this with |
It's implementing the exact same function as |
never mind my bad, missed the one important line |
@@ -136,6 +137,15 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe | |||
flMemory = parsedMemory | |||
} | |||
|
|||
var MemorySwap int64 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be flMemorySwap
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I considered this before, we already used flMemorySwap above, normally
this should be flMemorySwapString, but it's a bit too long.
If it's OK, I can change it to flMemorySwapString, what do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't worry about it, just keep it as is
LGTM |
This still has a dep on libcontainer being updated in docker. I'm working on that right now and will merge after we have the libcontainer change merged in. |
LGTM |
I think this was the commit @crosbymichael was referring to: docker-archive/libcontainer@e8f5b54 and it was merged |
Signed-off-by: Qiang Huang h.huangqiang@huawei.com