generate: rectify the arguments#371
Merged
Mashimiao merged 1 commit intoopencontainers:masterfrom Jul 6, 2017
Merged
Conversation
Mashimiao
reviewed
Apr 26, 2017
cmd/oci-runtime-tool/generate.go
Outdated
| // Set the DefaultAction of seccomp | ||
| if context.IsSet("seccomp-default") { | ||
| seccompDefault := context.String("seccomp-default") | ||
| if context.IsSet("linux-eccomp-default") { |
cmd/oci-runtime-tool/generate.go
Outdated
| cli.StringSliceFlag{Name: "process-rlimits-add", Usage: "specifies resource limits for processes inside the container. "}, | ||
| cli.StringSliceFlag{Name: "process-rlimits-remove", Usage: "remove specified resource limits for processes inside the container. "}, | ||
| cli.BoolFlag{Name: "process-rlimits-remove-all", Usage: "remove all resource limits for processes inside the container. "}, | ||
| cli.StringFlag{Name: "process-selinux-label", Usage: "process selinux label"}, |
There was a problem hiding this comment.
selinuxlabe is Linux-specific, linux-selinux-label will be better
Author
There was a problem hiding this comment.
selinuxLabel is part of the process, I think the process- will be better. linux-selinux-labelmay be confusing.
There was a problem hiding this comment.
As I said it's Linux-specific, not for all platforms.
cmd/oci-runtime-tool/generate.go
Outdated
| @@ -21,77 +21,77 @@ var generateFlags = []cli.Flag{ | |||
| cli.StringFlag{Name: "apparmor", Usage: "specifies the the apparmor profile for the container"}, | |||
zhouhao3
force-pushed
the
fix-argument
branch
2 times, most recently
from
20fc153 to
dcdb1de
Compare
|
need rebase |
Author
|
rebased. |
|
LGTM |
|
need rebase |
Author
|
updated |
|
@liangchenye @mrunalp @hqhq PTAL |
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
Author
|
@liangchenye @hqhq @mrunalp PTAL |
Member
|
LGTM |
1 similar comment
|
LGTM |
Mashimiao
pushed a commit
to Mashimiao/ocitools
that referenced
this pull request
Jul 6, 2017
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
wking
added a commit
to wking/ocitools-v2
that referenced
this pull request
Jul 10, 2017
…nux-label In 9c3863b (generate: rectify the arguments, 2017-04-24, opencontainers#371), the old --mount-label and --selinux-label became --linux-mount-label and --linux-selinux-label. However, the --mount-label use in this example wasn't updated and the --selinux-label use was incorrectly updated to --process-selinux-label. This commit brings the example back in line with the program source. I've also added backticks around --linux-selinux-label to get better formatting for the inline code [1]. [1]: https://daringfireball.net/projects/markdown/syntax#code Signed-off-by: W. Trevor King <wking@tremily.us>
wking
added a commit
to wking/ocitools-v2
that referenced
this pull request
Jul 11, 2017
Adjusting some --bind instances that were missed in 9c3863b (generate: rectify the arguments, 2017-04-24, opencontainers#371). Signed-off-by: W. Trevor King <wking@tremily.us>
wking
added a commit
to wking/ocitools-v2
that referenced
this pull request
Jul 11, 2017
Adjusting a --cwd instance that was missed in 9c3863b (generate: rectify the arguments, 2017-04-24, opencontainers#371). Signed-off-by: W. Trevor King <wking@tremily.us>
Mashimiao
pushed a commit
that referenced
this pull request
Jul 12, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Since in #343 (comment) @Kxuan put forward the idea, I submitted this PR.
Signed-off-by: zhouhao zhouhao@cn.fujitsu.com