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

1312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
d6f35cb0c8 execution: properly check container.Exec return value 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-04-28 07:14:17 +00:00
Stephen Day
12d65ceb50 Merge pull request #674 from dmcgowan/fs-hardlink-unmodified 
Fix hardlinks in tars for unmodified files
 2017-04-26 18:50:12 -05:00
Stephen Day
d0c7f13e39 Merge pull request #755 from miaoyq/avoid-creating-snapshots-repeatedly 
Avoid creating snapshots repeatedly
 2017-04-26 15:02:14 -05:00
Michael Crosby
f5adc0e019 Merge pull request #769 from vbatts/doc-correction 
snapshot: the examples need context
 2017-04-25 10:15:43 -07:00
Phil Estes
3fde908cbf Merge pull request #766 from miaoyq/add-an-alias-for-ctr-list 
Add an alias for ctr list
 2017-04-25 12:29:21 -04:00
Vincent Batts
7d018f2306
snapshot: the examples need context 
the api for these functions have since added `context.Context`

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-25 12:18:03 -04:00
Yanqiang Miao
bcc4d12706 Add an alias for ctr list 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-04-25 11:49:56 +08:00
Stephen Day
8f524ad42c Merge pull request #733 from kunalkushwaha/dist-cli-restructure 
dist cli reorganized into sub-commands
 2017-04-24 13:56:13 -05:00
Stephen Day
ce72a829c7 Merge pull request #752 from stevvooe/ctr-list-quiet 
cmd/ctr: add quiet mode to `ctr list`
 2017-04-24 13:46:58 -05:00
Stephen J Day
0377bfda5d
cmd/ctr: add quiet mode to ctr list 
This is so I can delete all the containers I keep creating.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-24 12:19:47 -05:00
Kenfe-Mickaël Laventure
7a9cfbf20e Merge pull request #743 from krasi-georgiev/ctrl-c-handle-kill-container-processes 
forward ctrl+c to stop container processes before exiting
 2017-04-24 10:36:56 -05:00
Phil Estes
012cc9d48c Merge pull request #760 from kevinswiber/armv7_fix 
Ensure proper types for arguments to `time.Unix`.
 2017-04-22 11:48:10 -05:00
Phil Estes
445da51f2f Merge pull request #762 from dklyle/master 
fix relative image paths
 2017-04-22 11:47:28 -05:00
Krasi Georgiev
e03485acda forward all signals to the container 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-04-22 01:46:57 +03:00
David Lyle
04f76c5505 fix relative image paths 
Signed-off-by: David Lyle <david.lyle@intel.com>
 2017-04-21 12:27:05 -06:00
Qiang Huang
455a185d98 Merge pull request #740 from crosbymichael/oom-event 
Emit oom events
 2017-04-20 17:23:24 -05:00
Qiang Huang
a9601d1df9 Merge pull request #746 from sak0/dev 
Correct the usage of containerd --config
 2017-04-20 16:56:46 -05:00
Kevin Swiber
b365fbecfd Ensure proper types for arguments to time.Unix. 
When compiling for armv7, the type is `int32` for `Timespec.Sec` and
`Timespec.Nsec` in the syscall package. When passing these values
to `time.Unix`, the values must be converted to `int64`.

Signed-off-by: Kevin Swiber <kswiber@gmail.com>
 2017-04-20 12:55:06 -07:00
Michael Crosby
714ffdb51a Merge pull request #756 from lilyfang/patch-1 
Update dockercon-summit.md
 2017-04-20 11:07:12 -07:00
Li Li
6ae973362a Update dockercon-summit.md 2017-04-20 01:31:00 -05:00
Phil Estes
a12b20ebc4 Merge pull request #748 from miaoyq/del-tmpdir 
Delete the temporary diractory at the end of the function "ApplyLayer"
 2017-04-20 00:10:35 -05:00
Yanqiang Miao
df8ece5a41 Avoid creating snapshots repeatedly 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-04-20 12:59:33 +08:00
Stephen Day
3d076e5c33 Merge pull request #747 from miaoyq/rm-redundant-type-conversion 
Remove the redundant type conversion
 2017-04-19 15:19:24 -05:00
Derek McGowan
aee5b75cd8 Merge pull request #742 from xiekeyang/tmpdir 
remove temporary dir
 2017-04-19 13:26:50 -05:00
Derek McGowan
0f035c712f Merge pull request #750 from stevvooe/fix-dist-apply-help 
cmd/dist: correct `dist apply` help
 2017-04-19 13:24:28 -05:00
Stephen J Day
6eac7c159e
cmd/dist: correct dist apply help 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-19 12:57:28 -05:00
Phil Estes
ae502e8c2a Merge pull request #749 from boucher/patch-1 
Checkpoint/Restore proposal
 2017-04-19 10:06:18 -05:00
Ross Boucher
9999e85f80 Checkpoint/Restore proposal 2017-04-19 08:57:10 -05:00
Yanqiang Miao
c5c6f36e83 Delete the temporary diractory at the end of the function 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-04-19 09:52:44 +08:00
Yanqiang Miao
d95e98d049 Remove the redundant type conversion 
The type of ocispec.Descriptor.Digest is digest.Digest now,
so the type conversion is redundant.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-04-18 16:55:19 +08:00
CuiHaozhi
d51976b60a Correct the usage of containerd --config 
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
 2017-04-17 06:44:18 -04:00
Kunal Kushwaha
18bcec512e dist subcommands reorganized. 
few dist commands reorganized into subcommands "image" and "content".
Fix for #689

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-04-17 13:58:37 +09:00
Stephen Day
bbeaab5ee3 Merge pull request #739 from crosbymichael/exitedat 
Add exited at to events and delete requests
 2017-04-14 13:10:53 -07:00
Michael Crosby
5d3bc1a4a7 windows process exit timestamp 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-14 11:22:07 -07:00
Stephen Day
2369f498f2 Merge pull request #741 from xiekeyang/coverage 
ignore coverage.out for git submit
 2017-04-14 09:00:18 -07:00
xiekeyang
e78e921fc1 remove temporary dir 
The temporary directory had better to be removed after test case
finished.

Signed-off-by: xiekeyang <xiekeyang@huawei.com>
 2017-04-14 12:05:37 +08:00
xiekeyang
fac24f67c7 ignore coverage.out for git submit 
coverage.out should be ignored when git submitting as well.

Signed-off-by: xiekeyang <xiekeyang@huawei.com>
 2017-04-14 10:58:33 +08:00
Michael Crosby
eba88c1752 Add oom event to monitors 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 15:18:43 -07:00
Michael Crosby
e745efdddb Bump cgroups pkg to e950a27f3faf567abbf995bfbec90 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 14:24:59 -07:00
Michael Crosby
efe177ed77 Add exited at to events and delete requests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 13:55:58 -07:00
Michael Crosby
d41f146eed Merge pull request #737 from fabiokung/summit-disk-quotas 
containerd summit: suggest a discussion about disk quotas
 2017-04-13 11:32:36 -07:00
Fabio Kung
f401bec0fd containerd summit: suggest a discussion about disk quotas 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
 2017-04-13 11:19:55 -07:00
Michael Crosby
7389500a2f Merge pull request #732 from coolljt0725/update_cli 
update `urfave/cli` to 8ba6f23b6e36d03666a14bd9421f5e3efcb59aca
 2017-04-13 11:01:22 -07:00
Phil Estes
07b5bca43c Merge pull request #735 from crosbymichael/socket-unpack 
Only set socket on non-nil type creation
 2017-04-13 13:58:12 -04:00
Phil Estes
b369a6bff3 Merge pull request #721 from kunalkushwaha/bugfix-664 
Correct the description of `dist get`.
 2017-04-13 13:30:18 -04:00
Michael Crosby
e46109ba81 Only set socket on non-nil type creation 
Because of go interface unpacking we need to only set the interface on
the opts when we actually have a socket.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 09:47:14 -07:00
Lei Jitang
33dca67daf update urfave/cli to 8ba6f23b6e36d03666a14bd9421f5e3efcb59aca 
relate to https://github.com/containerd/containerd/pull/723

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2017-04-13 07:59:32 -04:00
Phil Estes
4a749ad473 Merge pull request #725 from vbatts/make-install 
Makefile: fix `sudo make install`
 2017-04-12 15:42:17 -04:00
Phil Estes
2565202183 Merge pull request #724 from crosbymichael/oom-score 
Set oom score for containerd and shims
 2017-04-12 15:41:23 -04:00
Vincent Batts
ac28fee304
Makefile: fix sudo make install 
When there isn't a `go` outside of the user's PATH

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-12 14:47:38 -04:00