-
Notifications
You must be signed in to change notification settings - Fork 557
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
Move process specific settings to process #329
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,8 +14,6 @@ type LinuxSpec struct { | |
|
||
// Linux contains platform specific configuration for linux based containers. | ||
type Linux struct { | ||
// Capabilities are linux capabilities that are kept for the container. | ||
Capabilities []string `json:"capabilities"` | ||
// UIDMapping specifies user mappings for supporting user namespaces on linux. | ||
UIDMappings []IDMapping `json:"uidMappings,omitempty"` | ||
// GIDMapping specifies group mappings for supporting user namespaces on linux. | ||
|
@@ -35,16 +33,10 @@ type Linux struct { | |
Namespaces []Namespace `json:"namespaces"` | ||
// Devices are a list of device nodes that are created for the container | ||
Devices []Device `json:"devices"` | ||
// ApparmorProfile specified the apparmor profile for the container. | ||
ApparmorProfile string `json:"apparmorProfile"` | ||
// SelinuxProcessLabel specifies the selinux context that the container process is run as. | ||
SelinuxProcessLabel string `json:"selinuxProcessLabel"` | ||
// Seccomp specifies the seccomp security settings for the container. | ||
Seccomp Seccomp `json:"seccomp"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't we move seccomp as well? |
||
// RootfsPropagation is the rootfs mount propagation mode for the container. | ||
RootfsPropagation string `json:"rootfsPropagation,omitempty"` | ||
// NoNewPrivileges controls whether additional privileges could be gained by processes in the container. | ||
NoNewPrivileges bool `json:"noNewPrivileges,omitempty"` | ||
} | ||
|
||
// User specifies linux specific user and group information for the container's | ||
|
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.
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.
I'd like to move
Resources
andCgroupsPath
as well. Use case is that of running exec processes in a sub-container inside the main container. Imagine not letting your editor exec session resulting in a OOM kill of the container.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.
cgroups is more of a container level feature instead of just one process
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.
How can one then place resource restrictions on an exec'ed process? Run a
new container?
On Wed, Mar 2, 2016 at 1:02 PM, Michael Crosby [email protected]
wrote: