Skip to content

[release/1.2 backport] bump runc v1.0.0-rc9#3723

Merged
crosbymichael merged 3 commits intocontainerd:release/1.2from
thaJeztah:1.2_backport_bump_runc_1.0.0-rc9
Oct 7, 2019
Merged

[release/1.2 backport] bump runc v1.0.0-rc9#3723
crosbymichael merged 3 commits intocontainerd:release/1.2from
thaJeztah:1.2_backport_bump_runc_1.0.0-rc9

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Oct 5, 2019

backport of:

@thaJeztah
Copy link
Copy Markdown
Member Author

Looks like we need the updated seccomp package again;

# github.com/containerd/containerd/vendor/github.com/opencontainers/runc/libcontainer/seccomp
1023vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go:22:13: undefined: seccomp.ActLog
1024Makefile:169: recipe for target 'bin/containerd' failed

thaJeztah and others added 3 commits October 7, 2019 11:27
This reverts commit 8c0ec3c.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit f277665)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
No code changes since the last vendor bump

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit fe947e8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 1.2_backport_bump_runc_1.0.0-rc9 branch from 634888c to 639be35 Compare October 7, 2019 09:29
@thaJeztah
Copy link
Copy Markdown
Member Author

I brought back the bump to libseccomp-golang v0.9.1, which means that extra care should be taken when building containerd on a newer distro, but targeting older distros (this may be something to somehow mention in the release notes, so that packagers are aware of this)

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3723   +/-   ##
============================================
  Coverage        44.19%   44.19%           
============================================
  Files              100      100           
  Lines            10847    10847           
============================================
  Hits              4794     4794           
  Misses            5313     5313           
  Partials           740      740
Flag Coverage Δ
#linux 47.87% <ø> (ø) ⬆️
#windows 41% <ø> (ø) ⬆️

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 deca8e0...639be35. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 816dfe3 into containerd:release/1.2 Oct 7, 2019
@thaJeztah thaJeztah deleted the 1.2_backport_bump_runc_1.0.0-rc9 branch October 7, 2019 15:26
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