github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,017 Commits 3 Branches 2 Tags 112 MiB
f8538b5e12
Commit Graph

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
6af355f3c7
Merge pull request #3744 from crosbymichael/test-flags 
Move flag.Parse in tests to TestMain
 2019-10-11 14:13:10 -04:00
Michael Crosby
d5b7bf51aa
Move flag.Parse in tests to TestMain 
This this fixes issues with custom and testing flags in Go 1.3 and should work
in previous go versions.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-11 13:27:54 -04:00
Michael Crosby
38937f0607
Merge pull request #3718 from crosbymichael/devperms 
Add spec opts for host device and privileged handling
 2019-10-11 09:56:14 -04:00
Lantao Liu
815f3e727d
Merge pull request #1309 from Random-Liu/update-containerd 
Update containerd to a6a0c8b6e3.
 2019-10-10 15:15:45 -07:00
Phil Estes
41028772ba
Merge pull request #3741 from crosbymichael/localfs 
Add local-fs.target to service file
 2019-10-10 17:40:12 -04:00
Michael Crosby
54257bb5e6
Add local-fs.target to service file 
This will ensure that containerd is started after the /etc/fstab entries

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-10 17:06:39 -04:00
Michael Crosby
a6d3f4d30b
Add device opts to ctr --privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-10 14:23:59 -04:00
Lantao Liu
2ce0bb0926 Update code for latest containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 18:05:20 -07:00
Lantao Liu
4e2b4aa972 Update containerd to c0c6b51179. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 18:05:20 -07:00
Lantao Liu
22b18262e7
Merge pull request #1312 from Random-Liu/travis-trusty 
Explicitly specify trusty in travis.
 2019-10-09 13:01:57 -07:00
Lantao Liu
2a9a982ae3 Fix integration test for golang 1.13 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 10:51:02 -07:00
Lantao Liu
9a1e3655ed Update based on default xenial distro. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 10:51:02 -07:00
Lantao Liu
c368af1bc3 Configure golangci-lint 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 10:51:02 -07:00
Lantao Liu
10f88f99cc Fix appveyor test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 10:51:02 -07:00
Phil Estes
a6a0c8b6e3
Merge pull request #3736 from Random-Liu/final-fix-delete-code 
Fix delete error code on the containerd daemon side.
 2019-10-09 11:45:20 -04:00
Lantao Liu
ffcb1cc9be Fix delete error code on the containerd daemon side. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-09 00:28:51 -07:00
Derek McGowan
772aaf127a
Merge pull request #3729 from seemethere/fix_man 
build: Fix manpage generation
 2019-10-08 16:13:04 -07:00
Eli Uriegas
036db34f37
build: Fix manpage generation 
Seems to be that docs/man/ctr.1.md and docs/man/containerd.1.md were
removed in #3637 and were not updated correctly in the Makefile, leading
to build failures like:

    + make man

    make: *** No rule to make target `man/ctr.1', needed by `man'.  Stop.

Changes the gen-manpages command to be specific on which manpages are to
be generated.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-10-08 18:22:23 +00:00
Michael Crosby
c0c6b51179
Merge pull request #3730 from Random-Liu/fix-error-code 
Fix shim delete error code.
 2019-10-08 10:32:24 -04:00
Lantao Liu
06be794cb2 Fix shim delete error code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-07 23:21:57 -07:00
Phil Estes
614c0858f2
Merge pull request #3728 from crosbymichael/dist-rm 
Add distribution subpkgs to core
 2019-10-07 14:18:04 -04:00
Phil Estes
c58e1e20d6
Merge pull request #3725 from fuweid/me-use-runtime-version 
version: use runtime.Version() directly
 2019-10-07 13:54:28 -04:00
Michael Crosby
901bcb2231 Add distribution subpkgs to core 
Ref: #3554

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-07 13:38:12 -04:00
Wei Fu
eaef634ef7 version: use runtime.Version() directly 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-10-07 22:45:26 +08:00
Michael Crosby
25947db049 Add support for spec generation with host devices 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-07 10:37:58 -04:00
Michael Crosby
8d0d1ebb63
Merge pull request #3716 from fahedouch/add_go_version_to_cli 
adding go version to client description
 2019-10-07 10:29:23 -04:00
Maksym Pavlenko
635dbf251a
Merge pull request #3720 from dmcgowan/fix-flaky-btrfs 
Fix flaky btrfs test
 2019-10-06 17:10:11 -07:00
Akihiro Suda
ea8cb3ac46
Merge pull request #3721 from thaJeztah/bump_runc_1.0.0-rc9 
bump runc v1.0.0-rc9
 2019-10-06 23:07:26 +09:00
fahed dorgaa
c0984941e3 adding go version to client description 
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

gofmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add a Godoc

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

go fmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add sapces to comment

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
 2019-10-06 13:38:51 +02:00
Sebastiaan van Stijn
fe947e83dc
bump runc v1.0.0-rc9 
No code changes since the last vendor bump

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-06 00:02:29 +02:00
Derek McGowan
772032598a
Fix flaky btrfs test 
Add logging and move the creation of the snapshotter inside
the attempt loop to catch cases where the mountinfo may
not be updated yet. When all attempts are reached there
is no reason to create the snapshotter as the unmount has
already occurred.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-10-04 17:51:45 -07:00
Michael Crosby
2a6d13b2ca
Merge pull request #3719 from mxpv/lease_opts 
Make client's WithLease more flexible
 2019-10-04 17:06:59 -04:00
Maksym Pavlenko
e4e7e554d5 Make client's WithLease more flexible. 
It's sometimes useful to specify a custom lease configuration. In this
case clients have to deal with LeaseManager manually to create/defer delete lease (essentially dup
WithLease logic). This PR adds lease opts to WithLease, so options
can be specified inline.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-10-04 12:22:16 -07:00
Michael Crosby
38a0013c70
Merge pull request #3711 from Random-Liu/avoid-unnecessary-runc-state 
Use cached state instead of `runc state`.
 2019-10-04 15:05:11 -04:00
Lantao Liu
18be6e3714 Use cached state instead of runc state. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-03 10:53:13 -07:00
Michael Crosby
be6bead423
Merge pull request #3712 from estesp/add-completion-docs 
Add more detail on releases to README
 2019-10-03 13:22:04 -04:00
Phil Estes
4c2d740a2a
Merge pull request #3713 from crosbymichael/runc-bump2 
Bump runc to 1b8a1eeec3f337ab5d94f28980
 2019-10-03 12:01:21 -04:00
Michael Crosby
f277665edb Bump runc to 1b8a1eeec3f337ab5d94f28980 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-03 10:36:35 -04:00
Phil Estes
e33f70385b
Add more detail on releases 
Add more detail to the README.md where releases are found and also add
the documentation for how to use the new auto-completion capabilities
provided by urfave and enabled in a recent PR.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-10-03 09:52:03 -04:00
Phil Estes
309c9c25ba
Merge pull request #3706 from mrueg/enable-autocmpl 
ctr: Enable shell autocompletion
 2019-10-03 09:15:51 -04:00
Phil Estes
a83ae30016
Merge pull request #3681 from crosbymichael/bump-cgroups 
Update cri and cgroup packages
 2019-10-01 11:38:23 -04:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages 
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-01 10:19:56 -04:00
Phil Estes
1009023783
Merge pull request #3705 from dmcgowan/limit-travis-release 
Limit travis release script to a single build
 2019-10-01 08:24:48 -04:00
Manuel Rüger
b5fa55b0c2 ctr: Enable shell autocompletion 
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
 2019-10-01 09:43:21 +02:00
Derek McGowan
45ce735676
Limit travis release script to a single build 
Prevent Travis from building and pushing up multiple times

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-30 14:35:56 -07:00
Phil Estes
7f9530d95b
Merge pull request #3703 from yuxiaobo96/containerd-my 
fix-up :typo
 2019-09-30 08:52:01 -04:00
yuxiaobo
0cb7e4d5fd Perfect documentations 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
 2019-09-30 09:29:04 +08:00
Lantao Liu
0ebf032aac
Merge pull request #1306 from Random-Liu/extend-permission-denied-retry 
[WCOW] Extend permission denied retry to 3min.
 2019-09-27 10:21:36 -07:00
Lantao Liu
180e86ab39 Extend permission denied retry to 3min. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-26 22:39:00 -07:00
Wei Fu
36cf5b690d
Merge pull request #3689 from dmcgowan/release-1.3.0 
Update release docs for 1.3.0
 2019-09-27 09:04:35 +08:00