Skip to content

Commit

Permalink
Update runc to e775f0fba3ea329b8b766451c892c41a3d4
Browse files Browse the repository at this point in the history
This resolves logrus issues with containerd not being in sync with the
version runc is using.

This also updates the OCI runtime spec to v1.0.0

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
  • Loading branch information
crosbymichael committed Jul 31, 2017
1 parent ce07fa0 commit 2386062
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 22 deletions.
2 changes: 1 addition & 1 deletion RUNC.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ containerd is built with OCI support and with support for advanced features prov

We depend on a specific runc version when dealing with advanced features. You should have a specific build for development. The current supported runc commit is:

RUNC_COMMIT = 429a5387123625040bacfbb60d96b1cbd02293ab
RUNC_COMMIT = e775f0fba3ea329b8b766451c892c41a3d49594d

## building

Expand Down
4 changes: 2 additions & 2 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.0
github.com/docker/go-units v0.3.1
github.com/gogo/protobuf d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8
github.com/golang/protobuf 5a0f697c9ed9d68fef0116532c6e05cfeae00e55
github.com/opencontainers/runtime-spec 96de01bbb42c7af89bff100e10a9f0fb62e75bfb
github.com/opencontainers/runc 429a5387123625040bacfbb60d96b1cbd02293ab
github.com/opencontainers/runtime-spec v1.0.0
github.com/opencontainers/runc e775f0fba3ea329b8b766451c892c41a3d49594d
github.com/sirupsen/logrus v1.0.0
github.com/containerd/btrfs e9c546f46bccffefe71a6bc137e4c21b5503cc18
github.com/stretchr/testify v1.1.4
Expand Down
34 changes: 28 additions & 6 deletions vendor/github.com/opencontainers/runc/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/github.com/opencontainers/runc/vendor.conf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2386062

Please sign in to comment.