Skip to content

[release/1.1 backport] Update runc to 10d38b660a77168360df3522881e2dc2be#2802

Merged
estesp merged 4 commits intocontainerd:release/1.1from
thaJeztah:1.1_backport_bump_runc
Nov 17, 2018
Merged

[release/1.1 backport] Update runc to 10d38b660a77168360df3522881e2dc2be#2802
estesp merged 4 commits intocontainerd:release/1.1from
thaJeztah:1.1_backport_bump_runc

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Nov 16, 2018 •
edited
Loading 

git checkout -b 1.1.1_backport_bump_runc upstream/release/1.1
git cherry-pick -s -S -x ddc53c9cd277222025023d7ff51d1accbd9eea90
git cherry-pick -s -S -x 806a8f98bb5fbb8826cd8fc1e576f6fd406a26ae
git cherry-pick -s -S -x d7769daa5e2136886e642e7072ed4790601a87ca
git cherry-pick -s -S -x e1a59ba0fbd558397f64a041b0f90147cd842095

conflict in vendor.conf, but trivial to resolve, e.g.;

diff --cc vendor.conf
index 91316d00,70b48484..00000000
--- a/vendor.conf
+++ b/vendor.conf
@@@ -18,16 -18,15 +18,22 @@@ github.com/beorn7/perks 4c0e84591b9aa9e
  github.com/matttproud/golang_protobuf_extensions v1.0.0
  github.com/gogo/protobuf v1.0.0
  github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
++<<<<<<< HEAD
 +github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
 +github.com/opencontainers/runtime-spec v1.0.1
 +github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340
++=======
+ github.com/golang/protobuf v1.1.0
+ github.com/opencontainers/runtime-spec d810dbc60d8c5aeeb3d054bd1132fab2121968ce # v1.0.1-43-gd810dbc
+ github.com/opencontainers/runc 20aff4f0488c6d4b8df4d85b4f63f1f704c11abd
++>>>>>>> ddc53c9c... Update runc vendor
  github.com/sirupsen/logrus v1.0.0
 +github.com/pmezard/go-difflib v1.0.0
  github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
 -golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac
 -google.golang.org/grpc v1.12.0
 +golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
 +google.golang.org/grpc v1.10.1
  github.com/pkg/errors v0.8.0
 -github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
 +github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448
  golang.org/x/sys 1b2967e3c290b7c545b3db0deeda16e9be4f98a2 https://github.com/golang/sys
  github.com/opencontainers/image-spec v1.0.1
  golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c

dmcgowan and others added 4 commits November 16, 2018 20:25
@dmcgowan @thaJeztah
Update runc vendor
a6a94b1 
Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit ddc53c9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@crosbymichael @thaJeztah
Update runc to 00dc70017d222b178a002ed30e9321b126
132ee4c 
Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit 806a8f9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@crosbymichael @thaJeztah
Update runc to 58592df56734acf62e574865fe40b9e53e
f277cdc 
This includes fixes for user namespaces as well as a long standing bug
for running docker and containerd inside an lxc container.

Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit d7769da)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@crosbymichael @thaJeztah
Update runc to 10d38b660a77168360df3522881e2dc2be
4dbb90f 
Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit e1a59ba)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Nov 16, 2018

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #2802   +/-   ##
============================================
  Coverage        48.99%   48.99%           
============================================
  Files               85       85           
  Lines             7603     7603           
============================================
  Hits              3725     3725           
  Misses            3203     3203           
  Partials           675      675
Flag Coverage Δ
#linux 48.99% <ø> (ø) ⬆️

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 7cc1302...4dbb90f. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Nov 16, 2018

LGTM

@thaJeztah thaJeztah mentioned this pull request Nov 16, 2018
Merged
estesp
estesp approved these changes Nov 17, 2018
View reviewed changes
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

@estesp estesp merged commit 02f79c0 into containerd:release/1.1 Nov 17, 2018
@thaJeztah thaJeztah deleted the 1.1_backport_bump_runc branch November 17, 2018 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @codecov-io @crosbymichael @estesp @dmcgowan