[17.06] re-vndr containerd to docker/containerd 6e23458

[andrewhsu]

Re-vndr containerd to docker-archive/containerd@6e23458

$ cd components/engine
$ make BIND_DIR=. shell
$ vndr github.com/containerd/containerd
2017/07/11 07:14:44 Collecting initial packages
2017/07/11 07:14:44 Download dependencies
2017/07/11 07:14:45     Clone https://github.com/docker/containerd to github.com/containerd/containerd, revision 6e23458c129b551d5c9871e5174f6b1b7f6d1170
2017/07/11 07:14:47     Finished clone github.com/containerd/containerd
2017/07/11 07:14:47 Dependencies downloaded. Download time: 1.549271645s
2017/07/11 07:14:47 Collecting all dependencies
2017/07/11 07:14:56 Clean vendor dir from unused packages
2017/07/11 07:14:56 Success
2017/07/11 07:14:56 Running time: 11.911349402s

To bring in changes from:

• 17.06.1 chp containerd#4 17.06.1 chp

Note: there were 3 files that were deleted as a result of the vndr command:

        deleted:    vendor/github.com/spf13/cobra/doc/man_docs.go
        deleted:    vendor/github.com/spf13/cobra/doc/md_docs.go
        deleted:    vendor/github.com/spf13/cobra/doc/util.go

But I decided to leave them out of this PR. Will address in a separate PR.

[andrewhsu]

@tiborvass we should watch out for conflicts with PR #102 runtime spec fix

[andrewhsu]

Hmm...some tests failing:

00:12:33.343 [init] vendor/github.com/containerd/containerd/runtime/container_linux.go:115: cannot use i64Ptr(r.Memory) (type *int64) as type *uint64 in field value
00:12:33.343 [init] vendor/github.com/containerd/containerd/runtime/container_linux.go:116: cannot use i64Ptr(r.MemoryReservation) (type *int64) as type *uint64 in field value
00:12:33.343 [init] vendor/github.com/containerd/containerd/runtime/container_linux.go:117: cannot use i64Ptr(r.MemorySwap) (type *int64) as type *uint64 in field value
00:12:33.343 [init] vendor/github.com/containerd/containerd/runtime/container_linux.go:118: cannot use i64Ptr(r.KernelMemory) (type *int64) as type *uint64 in field value
00:12:33.343 [init] vendor/github.com/containerd/containerd/runtime/container_linux.go:119: cannot use i64Ptr(r.KernelTCPMemory) (type *int64) as type *uint64 in field value

[andrewhsu]

Looks like this PR build test is failing because I forgot to update components/engine/hack/dockerfile/binaries-commits with corresponding gitcommit for containerd.

I'm going to close this issue anyways because this is just a subset of changes that is already taken care of in PR #102 [17.06] Runtime spec fix