Skip to content

[release/1.1 backport] Bump runc 1.0.0-rc8, opencontainers/selinux v1.2.2#3248

Merged
dmcgowan merged 2 commits intocontainerd:release/1.1from
thaJeztah:1.1_backport_bump_runc_1.0.0rc8
May 3, 2019
Merged

[release/1.1 backport] Bump runc 1.0.0-rc8, opencontainers/selinux v1.2.2#3248
dmcgowan merged 2 commits intocontainerd:release/1.1from
thaJeztah:1.1_backport_bump_runc_1.0.0rc8

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

back port of #3240 for the 1.1 branch

full diff: opencontainers/runc@029124d...425e105

- opencontainers/runc#2043 Vendor in latest selinux code for keycreate errors

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit dd85aea)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit abd5f7c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: opencontainers/selinux@v1.2.1...v1.2.2

- opencontainers/selinux#51 Older kernels do not support keyring labeling

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit e5aab17)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 05c3be6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3248 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #3248   +/-   ##
============================================
  Coverage        49.07%   49.07%           
============================================
  Files               85       85           
  Lines             7598     7598           
============================================
  Hits              3729     3729           
  Misses            3194     3194           
  Partials           675      675
Flag Coverage Δ
#linux 49.07% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4278fbc...5994218. Read the comment docs.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan merged commit b72eee4 into containerd:release/1.1 May 3, 2019
@thaJeztah thaJeztah deleted the 1.1_backport_bump_runc_1.0.0rc8 branch May 3, 2019 23:33
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.

4 participants