Skip to content

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

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

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

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Apr 28, 2019

back port of #3240 for the 1.2 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]>
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]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3247 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3247   +/-   ##
============================================
  Coverage        43.74%   43.74%           
============================================
  Files              101      101           
  Lines            10743    10743           
============================================
  Hits              4700     4700           
  Misses            5311     5311           
  Partials           732      732
Flag Coverage Δ
#linux 47.38% <ø> (ø) ⬆️
#windows 40.85% <ø> (ø) ⬆️

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 af407fb...05c3be6. 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 f7b8ac5 into containerd:release/1.2 May 3, 2019
@thaJeztah thaJeztah deleted the 1.2_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