Skip to content

Commit 49f9dc4

Browse files
committed
Update runc and runtime-spec dependencies
Signed-off-by: Michael Crosby <[email protected]>
1 parent f3b85a9 commit 49f9dc4

File tree

104 files changed

+24675
-20236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+24675
-20236
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ install:
3838
- unzip -o -d /tmp/protobuf /tmp/protoc-3.1.0-linux-x86_64.zip
3939
- export PATH=$PATH:/tmp/protobuf/bin/
4040
- go get -u github.com/vbatts/git-validation
41-
- sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-1/runc -O /bin/runc; sudo chmod +x /bin/runc
41+
- sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-2/runc -O /bin/runc; sudo chmod +x /bin/runc
4242
- wget https://github.com/xemul/criu/archive/v3.0.tar.gz -O /tmp/criu.tar.gz
4343
- tar -C /tmp/ -zxf /tmp/criu.tar.gz
4444
- 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 build for development. The current supported runc commit is:
44

5-
RUNC_COMMIT = 50401b5b4c2e01e4f1372b73a021742deeaf4e2d
5+
RUNC_COMMIT = 429a5387123625040bacfbb60d96b1cbd02293ab
66

77
## building
88

cmd/ctr/exec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var execCommand = cli.Command{
5252
return err
5353
}
5454

55-
pspec := &spec.Process
55+
pspec := spec.Process
5656
pspec.Terminal = tty
5757
pspec.Args = args
5858

spec_unix.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"context"
77
"encoding/json"
88
"fmt"
9-
"runtime"
109
"strconv"
1110
"strings"
1211

@@ -64,14 +63,10 @@ func defaultNamespaces() []specs.LinuxNamespace {
6463
func createDefaultSpec() (*specs.Spec, error) {
6564
s := &specs.Spec{
6665
Version: specs.Version,
67-
Platform: specs.Platform{
68-
OS: runtime.GOOS,
69-
Arch: runtime.GOARCH,
70-
},
7166
Root: specs.Root{
7267
Path: defaultRootfsPath,
7368
},
74-
Process: specs.Process{
69+
Process: &specs.Process{
7570
Cwd: "/",
7671
NoNewPrivileges: true,
7772
User: specs.User{

vendor.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
2-
github.com/containerd/go-runc 60e87b3b047d4c93faa996699f6fdcfa34685e65
2+
github.com/containerd/go-runc 5d38580d03f4fbf2f09b2b0065deeeaf8d21aac2
33
github.com/containerd/console e0a2cdcf03d4d99c3bc061635a66cf92336c6c82
4-
github.com/containerd/cgroups 7b2d1a0f50963678d5799e29d17a4d611f5a5dee
4+
github.com/containerd/cgroups c3fc2b77b568af2406f3931cf3d3f17d76736886
55
github.com/docker/go-metrics 8fd5772bf1584597834c6f7961a530f06cbfbb87
66
github.com/docker/go-events aa2e3b613fbbfdddbe055a7b9e3ce271cfd83eca
77
github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
@@ -14,8 +14,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.0
1414
github.com/docker/go-units v0.3.1
1515
github.com/gogo/protobuf d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8
1616
github.com/golang/protobuf 5a0f697c9ed9d68fef0116532c6e05cfeae00e55
17-
github.com/opencontainers/runtime-spec v1.0.0-rc5
18-
github.com/opencontainers/runc 639454475cb9c8b861cc599f8bcd5c8c790ae402
17+
github.com/opencontainers/runtime-spec 198f23f827eea397d4331d7eb048d9d4c7ff7bee
18+
github.com/opencontainers/runc 429a5387123625040bacfbb60d96b1cbd02293ab
1919
github.com/Sirupsen/logrus v0.11.0
2020
github.com/containerd/btrfs e9c546f46bccffefe71a6bc137e4c21b5503cc18
2121
github.com/stretchr/testify v1.1.4
@@ -27,7 +27,7 @@ golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
2727
google.golang.org/grpc v1.3.0
2828
github.com/pkg/errors v0.8.0
2929
github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448
30-
golang.org/x/sys f3918c30c5c2cb527c0b071a27c35120a6c0719a
30+
golang.org/x/sys fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a https://github.com/golang/sys
3131
github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13
3232
github.com/containerd/continuity 86cec1535a968310e7532819f699ff2830ed7463
3333
golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c

vendor/github.com/containerd/cgroups/LICENSE

Lines changed: 201 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/cgroups/README.md

Lines changed: 0 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/cgroups/hugetlb.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/containerd/cgroups/memory.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)