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 runtime spec to rc5 #1370

Merged
merged 2 commits into from
Mar 16, 2017
Merged

Conversation

mrunalp
Copy link
Contributor

@mrunalp mrunalp commented Mar 14, 2017

Signed-off-by: Mrunal Patel mrunalp@gmail.com

@mrunalp mrunalp changed the title WIP: Update runtime spec to rc5 Update runtime spec to rc5 Mar 14, 2017
@mrunalp
Copy link
Contributor Author

mrunalp commented Mar 14, 2017

@crosbymichael PTAL

@rh-atomic-bot
Copy link

257/264 passed on RHEL - Failed.
253/262 passed on CentOS - Failed.
262/263 passed on Fedora - Failed.
Log - https://aos-ci.s3.amazonaws.com/opencontainers/runc/runc-integration-tests-prs/292/fullresults.xml

@crosbymichael
Copy link
Member

@justincormack can you double check the cap changes

@crosbymichael
Copy link
Member

crosbymichael commented Mar 14, 2017

LGTM

Approved with PullApprove

@crosbymichael
Copy link
Member

Do we need to remove the capabilities_ambient.go file and build tag now what we have support for it built into the spec?

@@ -114,7 +114,7 @@ type Config struct {

// Capabilities specify the capabilities to keep when executing the process inside the container
// All capbilities not specified will be dropped from the processes capability mask
Copy link
Contributor

Choose a reason for hiding this comment

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

may as well fix the typo above too...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@justincormack
Copy link
Contributor

Yes, the build tag needs to go.

@mrunalp
Copy link
Contributor Author

mrunalp commented Mar 15, 2017

Pushed a commit to remove the ambient build tag.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
@crosbymichael
Copy link
Member

crosbymichael commented Mar 15, 2017

LGTM

Approved with PullApprove

@@ -6,7 +6,7 @@ github.com/docker/go-units 9b001659dd36225e356b4467c465d732e745f53d
github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
github.com/golang/protobuf/proto f7137ae6b19afbfd61a94b746fda3b3fe0491874
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
github.com/opencontainers/runtime-spec/specs-go 794ca7ac88234607f9d2c76da8a6e9bbbade8cb9
github.com/opencontainers/runtime-spec/specs-go 035da1dca3dfbb00d752eb58b0b158d6129f3776
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer if we used tags here...

@cyphar
Copy link
Member

cyphar commented Mar 16, 2017

LGTM, aside from the nit. Feel free to merge.

Approved with PullApprove

@dqminh
Copy link
Contributor

dqminh commented Mar 16, 2017

LGTM

Approved with PullApprove

@dqminh dqminh merged commit 697cb97 into opencontainers:master Mar 16, 2017
stefanberger pushed a commit to stefanberger/runc that referenced this pull request Sep 7, 2017
The format of the capabilities section in config.json was changed in the
runtime spec 1.0.0.rc5 (pulled in through PR opencontainers#1370). Update the example
in README.md correspondingly.

Also fix a small typo (though -> through).

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
stefanberger pushed a commit to stefanberger/runc that referenced this pull request Sep 8, 2017
The format of the capabilities section in config.json was changed in the
runtime spec 1.0.0.rc5 (pulled in through PR opencontainers#1370). Update the example
in README.md correspondingly.

Also fix a small typo (though -> through).

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 15, 2020
This build tag was removed in commit 4f903a2 (PR opencontainers#1370)
quite some time ago.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
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.

6 participants