Skip to content
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

Update rc6 #425

Merged
merged 2 commits into from
Jul 15, 2017
Merged

Update rc6 #425

merged 2 commits into from
Jul 15, 2017

Conversation

Mashimiao
Copy link

updated to spec v1.0.0-rc6 and fix changes based on it.

// Process configures the container process.
Process Process `json:"process"`
Process *Process `json:"process,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this change will mean you'll need an initProcess function and some nil checks (e.g. here). You'll also need similar changes for Root*Root.

@@ -540,14 +550,21 @@ const (
type LinuxSeccompArg struct {
Index uint `json:"index"`
Value uint64 `json:"value"`
ValueTwo uint64 `json:"valueTwo"`
ValueTwo uint64 `json:"valueTwo,omiempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

You'll probably want to use a runtime-spec commit that includes opencontainers/runtime-spec#884 (which didn't make it into rc6). We'll have to replace the version comparison and generation default with a hard-coded version, probably by defining our own target-spec-version variable in a local version package. But because runtime-spec versions do not cover their Go library, I think we'd have to do that regardless.

Signed-off-by: Ma Shimiao <[email protected]>
@cyphar
Copy link
Member

cyphar commented Jul 14, 2017

/ping @opencontainers/runtime-tools-maintainers? This is quite important for tools like umoci that require the generate library and want to match the OCI 1.0 release (which is next week). In the meantime I'm going to apply this patch for umoci's vendor/.

@vbatts
Copy link
Member

vbatts commented Jul 14, 2017

LGTM

Approved with PullApprove

1 similar comment
@mrunalp
Copy link
Contributor

mrunalp commented Jul 15, 2017

LGTM

Approved with PullApprove

@mrunalp mrunalp merged commit 032091c into opencontainers:master Jul 15, 2017
@cyphar
Copy link
Member

cyphar commented Jul 15, 2017

❤️ Thanks for the fast reponse. 😸

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.

5 participants