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

11435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
a11de50127 Remove LinuxContainer interface 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-11 15:26:26 -07:00
Michael Crosby
466e14aa71 Move errors to plugin pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-11 15:25:26 -07:00
Michael Crosby
01b9f5ec67 Move Container and runtime to plugin pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-11 15:24:12 -07:00
Derek McGowan
fa4e114979 Merge pull request #844 from crosbymichael/revert-darwin 
Revert "Only build shim on Linux"
 2017-05-11 11:07:29 -07:00
Derek McGowan
47dca20bc7 Merge pull request #841 from justincormack/continuity-up 
Further fixes for FreeBSD
 2017-05-11 10:58:38 -07:00
Michael Crosby
cc62edb4d6 Revert "Only build shim on Linux" 
This reverts commit 296ad66d2d.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-11 10:56:49 -07:00
Justin Cormack
699f846813 Further fixes for FreeBSD 
This fixes a lot more issues for FreeBSD, including update for continuity vendor.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-11 10:45:59 +01:00
Akihiro Suda
2562aca1a3 new service: version 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-11 09:07:43 +00:00
Michael Crosby
b53105ed25 Merge pull request #821 from stevvooe/content-unify-provider-ingester 
content: unify provider and ingester
 2017-05-10 17:21:45 -07:00
Stephen J Day
193abed96e
content: unify provider and ingester 
The split between provider and ingester was a long standing division
reflecting the client-side use cases. For the most part, we were
differentiating these for the algorithms that operate them, but it made
instantation and use of the types challenging. On the server-side, this
distinction is generally less important. This change unifies these types
and in the process we get a few benefits.

The first is that we now completely access the content store over GRPC.
This was the initial intent and we have now satisfied this goal
completely. There are a few issues around listing content and getting
status, but we resolve these with simple streaming and regexp filters.
More can probably be done to polish this but the result is clean.

Several other content-oriented methods were polished in the process of
unification. We have now properly seperated out the `Abort` method to
cancel ongoing or stalled ingest processes. We have also replaced the
`Active` method with a single status method.

The transition went extremely smoothly. Once the clients were updated to
use the new methods, every thing worked as expected on the first
compile.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-10 17:05:53 -07:00
Stephen Day
31cf34b726 Merge pull request #839 from crosbymichael/update-deps 
Update deps after move to containerd org
 2017-05-10 17:01:51 -07:00
Michael Crosby
23b2b09d13 Update deps after move to containerd org 
This updates containerd to use the latest versions of cgroups, fifo,
console, and go-runc from the containerd org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-10 16:51:48 -07:00
Michael Crosby
79e389e549 Merge pull request #836 from crosbymichael/wait-copygroup 
Wait for copy routines to be scheduled
 2017-05-10 15:54:09 -07:00
Kenfe-Mickael Laventure
ad59eee377 Make reaper.Monitor returns an error when exit code is not 0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-10 13:18:31 -07:00
Phil Estes
a1173ce712 Merge pull request #815 from AkihiroSuda/dtype 
overlay: abort if backing fs lacks support for d_type
 2017-05-10 14:24:00 -05:00
Michael Crosby
2f942e137d Wait for copy routines to be scheduled 
Fixes #770

Use a wait group to wait for the `io.Copy` go routines to be scheduled
before continuing to start the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-10 11:50:55 -07:00
Stephen Day
d553fab079 Merge pull request #822 from AkihiroSuda/fix-vet 
fix `make vet` failures, and enable `make vet` on CI
 2017-05-10 11:42:24 -07:00
Lantao Liu
fe37d7bc96 Merge pull request #31 from Random-Liu/enhance-fake-execution-client 
Enhance fake execution client.
 2017-05-10 10:46:44 -07:00
Michael Crosby
01315ed881 Merge pull request #818 from stevvooe/close-and-remove-tmpfile 
cmd/dist: close and remove tempfile after edit
 2017-05-10 10:11:13 -07:00
Random-Liu
9baadc1b4b Enhance fake execution client. 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-05-10 10:03:18 -07:00
Michael Crosby
07fda4b73a Merge pull request #813 from AkihiroSuda/btrfs-zero-config 
btrfs: auto-detect device
 2017-05-10 09:53:18 -07:00
Michael Crosby
c8beb57cbe Merge pull request #832 from justincormack/no-darwinian-shim 
Only build shim on Linux
 2017-05-10 09:43:30 -07:00
Justin Cormack
296ad66d2d Only build shim on Linux 
Currently does not build on any other platform, so add them in when
it builds.

With this Darwin builds without any errors.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-10 11:51:16 +01:00
Akihiro Suda
e64757b657 fsutils: refactor test 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-10 05:23:28 +00:00
Akihiro Suda
8cd218237b mountinfo: refactored 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-10 05:10:22 +00:00
Akihiro Suda
837205005f fix make vet failures, and enable make vet on CI 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-10 04:36:41 +00:00
Michael Crosby
5e192fae6c Merge pull request #826 from mlaventure/fix-healtcheck-warning 
Don't print a warning when getting a healtcheck request
 2017-05-09 15:49:45 -07:00
Kenfe-Mickael Laventure
180eaf724e Don't print a warning when getting a healtcheck request 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-09 15:32:05 -07:00
Stephen J Day
941b0e47b0
cmd/dist: close and remove tempfile after edit 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-09 15:17:03 -07:00
Derek McGowan
3fb31b5a68 Merge pull request #820 from containerd/add-fossa-badge 
Add license scanning badge
 2017-05-09 10:08:59 -07:00
Chris Aniszczyk
f240c6d8e3 Add license scanning badge 
In CNCF, we are starting to experiment with automated license scanning across our projects to ensure compliance to the CNCF IP Policy. For now, we're experimenting with FOSSA: https://app.fossa.io/reports/50dc07d0-435f-4856-9549-33a5f41bef81

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
 2017-05-09 09:44:24 -05:00
Stephen Day
25a161bf5d Merge pull request #812 from AkihiroSuda/ctr-rootfs 
Allow specification of rootfs in ctr
 2017-05-08 11:47:07 -07:00
Phil Estes
3e485e4623 Merge pull request #811 from miaoyq/replace-two-Unlock-with-defer-Unlock 
User 'defer Unlock' to replace two 'Unlock's
 2017-05-08 14:04:33 -04:00
Derek McGowan
b12f18919d Merge pull request #786 from stevvooe/edit-content-command 
cmd/dist: add ability to edit content
 2017-05-08 10:59:22 -07:00
Daniel, Dao Quang Minh
392dfd656e Merge pull request #792 from coolljt0725/consistent_error 
Use consistent errors package
 2017-05-08 12:37:36 -05:00
Michael Crosby
eb995311eb Merge pull request #816 from windmilleng/nicks/symlinky 
fs: Change CopyDir's utimes call to not follow symlinks
 2017-05-08 10:30:05 -07:00
Michael Crosby
e7e60a8a1f Merge pull request #799 from dmcgowan/snapshot-fs-tests 
Add test suite for filesystem tests
 2017-05-08 10:19:42 -07:00
Nick Santos
e509da9c7d fs: Change CopyDir's utimes call to not follow symlinks 
Following symlinks does not look like it was intended behavior here,
and fails if the symlink target has not been copied yet.

Signed-off-by: Nick Santos <nicholas.j.santos@gmail.com>
 2017-05-08 13:16:53 -04:00
Michael Crosby
a1d5fc633e Merge pull request #807 from estesp/add-pause-resume 
Add pause/resume implementation
 2017-05-08 10:15:58 -07:00
Akihiro Suda
825c2ce3cc overlay: abort if backing fs lacks support for d_type 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-08 06:54:31 +00:00
Akihiro Suda
6e2457f186 import github.com/moby/moby/pkg/fsutils (v17.05.0-ce) as fs/fsutils 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-08 06:46:55 +00:00
Phil Estes
91410874e7
Add pause/unpause implementation 
This adds pause and unpause to containerd's execution service and the
same commands to the `ctr` client.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-05-06 16:05:37 -04:00
Akihiro Suda
d5707d3ac7 btrfs: auto-detect device 
No longer need to set `plugins.snapshot-btrfs.device` manually

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-06 17:29:37 +00:00
Justin Cormack
4535198999 Allow specification of rootfs in ctr 
carry: justincormack/containerd@ffe684b017

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-06 17:26:02 +00:00
Akihiro Suda
e37c337a3b mountinfo: remove unused functions 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-06 16:32:46 +00:00
Akihiro Suda
0f21829c2e new package: mountinfo 
import github.com/moby/moby/pkg/mount (v17.05.0-ce)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-06 16:29:40 +00:00
Yanqiang Miao
f59c7a87da User 'defer Unlock' to replace two 'Unlock's 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-05-06 14:21:16 +08:00
Stephen Day
73466a200d Merge pull request #810 from crosbymichael/report-may5 
Add dev report for may 5
 2017-05-05 17:44:33 -07:00
Michael Crosby
284e8bc618 Add dev report for may 5 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-05 16:22:36 -07:00
Derek McGowan
aac28c773b Merge pull request #806 from vbatts/allow_no_btrfs 
containerd: compile tags to exclude btrfs
 2017-05-05 13:51:41 -07:00