Skip to content

Commit a1a9bda

Browse files
estespestesp
authored
Merge pull request #1933 from crosbymichael/cherry-runc-bump
[cherrypick] Update runc to 7f24b40cc5423969b4554ef04ba0b00e2
2 parents 49540d6 + e643d8e commit a1a9bda

7 files changed

Lines changed: 6 additions & 44 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ install:
4242
- sudo chmod -R og+r /usr/local/include/google/protobuf/
4343
- protoc --version
4444
- go get -u github.com/vbatts/git-validation
45-
- sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-7/runc -O /bin/runc; sudo chmod +x /bin/runc
45+
- sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-8/runc -O /bin/runc; sudo chmod +x /bin/runc
4646
- wget https://github.com/xemul/criu/archive/v3.0.tar.gz -O /tmp/criu.tar.gz
4747
- tar -C /tmp/ -zxf /tmp/criu.tar.gz
4848
- cd /tmp/criu-3.0 && sudo make install-criu

‎RUNC.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ containerd is built with OCI support and with support for advanced features prov
22

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

5-
RUNC_COMMIT = 74a17296470088de3805e138d3d87c62e613dfc4
5+
RUNC_COMMIT = 7f24b40cc5423969b4554ef04ba0b00e2b4ba010
66

77
For more information on how to clone and build runc see the runc Building [documentation](https://github.com/opencontainers/runc#building).
88

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ github.com/docker/go-units v0.3.1
1616
github.com/gogo/protobuf v0.5
1717
github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
1818
github.com/opencontainers/runtime-spec v1.0.0
19-
github.com/opencontainers/runc 74a17296470088de3805e138d3d87c62e613dfc4
19+
github.com/opencontainers/runc 7f24b40cc5423969b4554ef04ba0b00e2b4ba010
2020
github.com/sirupsen/logrus v1.0.0
2121
github.com/containerd/btrfs cc52c4dea2ce11a44e6639e561bb5c2af9ada9e3
2222
github.com/stretchr/testify v1.1.4

‎vendor/github.com/opencontainers/runc/README.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎vendor/github.com/opencontainers/runc/vendor.conf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)