Skip to content

Conversation

@zhouhao3
Copy link

Since in #343 (comment) @Kxuan put forward the idea, I submitted this PR.

Signed-off-by: zhouhao [email protected]

// Set the DefaultAction of seccomp
if context.IsSet("seccomp-default") {
seccompDefault := context.String("seccomp-default")
if context.IsSet("linux-eccomp-default") {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linux-eccomp -> linux-seccomp

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"},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

selinuxlabe is Linux-specific, linux-selinux-label will be better

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

selinuxLabel is part of the process, I think the process- will be better. linux-selinux-labelmay be confusing.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I said it's Linux-specific, not for all platforms.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

)

var generateFlags = []cli.Flag{
cli.StringFlag{Name: "apparmor", Usage: "specifies the the apparmor profile for the container"},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apparmor is also Linux-specific

@zhouhao3 zhouhao3 force-pushed the fix-argument branch 2 times, most recently from 20fc153 to dcdb1de Compare April 26, 2017 09:09
@Mashimiao
Copy link

need rebase

@zhouhao3
Copy link
Author

zhouhao3 commented May 8, 2017

rebased.

@Mashimiao
Copy link

Mashimiao commented May 9, 2017

LGTM

Approved with PullApprove

@Mashimiao
Copy link

need rebase

@zhouhao3
Copy link
Author

updated

@Mashimiao
Copy link

@liangchenye @mrunalp @hqhq PTAL

@zhouhao3
Copy link
Author

zhouhao3 commented Jul 6, 2017

@liangchenye @hqhq @mrunalp PTAL

@liangchenye
Copy link
Member

liangchenye commented Jul 6, 2017

LGTM

Approved with PullApprove

1 similar comment
@Mashimiao
Copy link

Mashimiao commented Jul 6, 2017

LGTM

Approved with PullApprove

@Mashimiao Mashimiao merged commit b0b4406 into opencontainers:master Jul 6, 2017
@zhouhao3 zhouhao3 deleted the fix-argument branch July 6, 2017 07:32
Mashimiao pushed a commit to Mashimiao/ocitools that referenced this pull request Jul 6, 2017
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
mrunalp pushed a commit that referenced this pull request Jul 11, 2017
Mashimiao pushed a commit that referenced this pull request Jul 12, 2017
* *: Fix --bind, --cwd, etc missed options

Adjusting some option instances that were missed in 9c3863b
(generate: rectify the arguments, 2017-04-24, #371).

Signed-off-by: W. Trevor King <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants