github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,778 Commits 3 Branches 2 Tags 112 MiB
498eebe860
Commit Graph

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
85aa8ad361 Move task events to runc v2 shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-01-25 14:15:43 -05:00
Lantao Liu
538a361b3a
Merge pull request #1028 from fuweid/detect-dirty-vendor 
hack/Makefile: detect dirty vendor
 2019-01-25 10:33:41 -08:00
Phil Estes
9aac018896
Merge pull request #2957 from Random-Liu/update-cri 
Update cri to 4dd6735020.
 2019-01-25 12:41:07 -05:00
Phil Estes
a54d649339
Merge pull request #2956 from jterry75/runhcs_vendor_update 
Revendor github.com/Microsoft/hcsshim v0.8.4
 2019-01-25 12:40:24 -05:00
Phil Estes
f63d28984c
Merge pull request #2939 from jterry75/bug_publishstart 
Implement the Runtime v2 Shim async task model for runhcs
 2019-01-25 12:39:48 -05:00
Lantao Liu
28f8a90bd7 Update cri plugin to 4dd6735020. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 18:38:09 -08:00
Wei Fu
119222016f hack/Makefile: detect dirty vendor 
use containerd/project script to detect dirty vendor.

close: #1012

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-01-25 10:10:43 +08:00
Lantao Liu
4dd6735020
Merge pull request #1029 from Random-Liu/add-runtime-config-api 
Add a generic runtime options api.
 2019-01-24 17:36:20 -08:00
Justin Terry (VM)
bb32c0f619 Revendor github.com/Microsoft/hcsshim v0.8.4 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-24 13:46:07 -08:00
Lantao Liu
5d1a07e86c
Merge pull request #1032 from Random-Liu/small-code-cleanup 
Don't use string when there is a constant.
 2019-01-24 12:58:16 -08:00
Lantao Liu
9a455daf4d Don't use string when there is a constant. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 11:45:16 -08:00
Lantao Liu
bf00de33a5
Merge pull request #1025 from JoeWrightss/patch-4 
Fix some typos in comment
 2019-01-24 11:17:33 -08:00
Lantao Liu
97c7a1b17b
Merge pull request #1027 from Random-Liu/fix-log-ending-newline 
Fix the log ending newline handling.
 2019-01-24 10:22:03 -08:00
Phil Estes
acdb225c2b
Merge pull request #2952 from crosbymichael/interrupt-return 
Return out of windows signal handler
 2019-01-24 08:18:18 -05:00
Lantao Liu
d9914c8dbd Always fallback to the new runtime options. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 00:59:02 -08:00
Lantao Liu
42aba00a31 Add runtime config api. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 00:59:02 -08:00
Lantao Liu
556b219450 Fix lint error. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 18:14:34 -08:00
Lantao Liu
879dc6ae25 Add integration test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 18:14:34 -08:00
Lantao Liu
50ac40097e Fix the log ending newline handling. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 17:23:13 -08:00
Michael Crosby
f444696989 Return out of windows signal handler 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-01-23 16:06:49 -05:00
Derek McGowan
3762378760
Merge pull request #2944 from Random-Liu/fix-stdin-close 
Don't cancel context passed to `OpenFifo`.
 2019-01-23 10:51:12 -08:00
Michael Crosby
09029eb294
Merge pull request #2949 from justincormack/chtimes_osx 
unix.UtimesNanoAt now supported on Darwin and sets nanosecond precision if filesystems does
 2019-01-23 13:22:34 -05:00
Lantao Liu
26ab393e7d Use context.Background for O_NONBLOCK OpenFifo. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 10:18:54 -08:00
Justin Cormack
7db5697719
unix.UtimesNanoAt now supported on Darwin 
unix.UtimesNanoAt now supported on Darwin and sets nanosecond precision if the filesystems does.
This call is now generally supported. Note that os.Chtimes also sets nanosecond precision,
but will always follow symlinks so not appropriate.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2019-01-23 17:57:09 +00:00
Michael Crosby
aee74ad2f8
Merge pull request #2948 from fuweid/fix_linter_issue 
fix: linter issue
 2019-01-23 10:58:50 -05:00
Wei Fu
132ee9b826 fix: linter issue 
megacheck, gosimple and unused has been deprecated and subsumed by
staticcheck. And staticcheck also has been upgraded. we need to update
code for the linter issue.

close: #2945

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-01-23 22:54:51 +08:00
Michael Crosby
35582cb7a3
Merge pull request #2899 from fuweid/proposal-add-Add-method-in-PlatformRuntime 
runtime: add Add/Delete method in PlatformRuntime interface
 2019-01-22 13:48:39 -05:00
Justin Terry (VM)
6468619d73 Implement the Runtime v2 Shim async task model for runhcs 
Changes the requirement of a Runtime v2 shim in order to avoid race conditions
between shim and shim client sending async events. Places a requirement of what
events and what order a shim must comply to.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-17 14:56:37 -08:00
Michael Crosby
3acf6f1835
Merge pull request #2936 from estesp/post-2622-cleanups 
Handle additional cleanups from prior PR
 2019-01-17 11:58:42 -05:00
zhoulin xie
ae1b7ac4fd Fix some typos in comment 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-01-17 15:50:46 +08:00
Phil Estes
b444d7d507
Handle additional cleanups from prior PR 
Update comment and streamline getting the default platform spec

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-01-16 13:07:29 -05:00
Phil Estes
df97414a77
Merge pull request #2622 from kadisi/export_bug 
fix ctr image export not found error
 2019-01-16 12:59:34 -05:00
Michael Crosby
7d75a3f282
Merge pull request #2935 from jhowardmsft/jjh/rightexitcode 
Windows: Publish exit status correctly in TaskExit
 2019-01-15 15:17:11 -05:00
Michael Crosby
4915476f11
Merge pull request #2934 from jhowardmsft/jjh/fifoset 
Windows:NewDirectIOFromFIFOSet
 2019-01-15 15:17:02 -05:00
John Howard
4ef9bf5c84 Windows: Publish exit status correctly in TaskExit 
Signed-off-by: John Howard <jhoward@microsoft.com>

Before this change, the shim was only publishing a non-zero exit status
(exit code) in the case that the process.Wait() call failed. This
grabs the exit status correctly when process.Wait() succeeds too.
 2019-01-15 11:12:27 -08:00
John Howard
90caf6f6a7 Windows:NewDirectIOFromFIFOSet 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2019-01-15 10:04:43 -08:00
Michael Crosby
96f306ee4c
Merge pull request #2900 from Ace-Tang/fix_snapshot_remove 
fix: miss remove temp file in createSnapshot
 2019-01-15 11:42:27 -05:00
Phil Estes
804faeacdb
Merge pull request #2930 from cpuguy83/update_ttrpc 
Update ttrpc to support context timeout.
 2019-01-15 11:23:00 -05:00
Michael Crosby
4bad5c0247
Merge pull request #2931 from AkihiroSuda/runc20190115 
bump up runc for pivot fix
 2019-01-15 10:57:09 -05:00
Phil Estes
33b56e253e
Merge pull request #2927 from jterry75/bug_io_relay_close 
Fix issue in runhcs shim CloseIO
 2019-01-15 09:59:09 -05:00
Phil Estes
038d707889
Merge pull request #2929 from dmcgowan/releases-update 
Update releases files
 2019-01-15 09:58:15 -05:00
Akihiro Suda
3aec9e7beb bump up runc 
Changes: 96ec2177ae...12f6a99120

Including critical security fix for `runc run --no-pivot` (`DOCKER_RAMDISK=1`): https://github.com/opencontainers/runc/pull/1962

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2019-01-15 16:27:31 +09:00
Brian Goff
0befa457d3 Update ttrpc to support context timeout. 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2019-01-14 20:11:53 -08:00
Derek McGowan
946e402663
Update releases files 
Brings versions and statuses up to date

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-01-14 15:42:55 -08:00
John Howard
e30bba53ff
Merge pull request #2926 from jterry75/bug_argon_mount 
Fix runhcs shim bug in Create with "len(Rootfs) == 0"
 2019-01-14 15:26:32 -08:00
Derek McGowan
5a6b18042b
Merge pull request #2925 from jterry75/bug_exec_pid 
Fixes a bug in runhcs shim Exec.Pid
 2019-01-14 14:48:48 -08:00
Phil Estes
c171b615ff
Merge pull request #2814 from fuweid/support_legacy_media_type 
bugfix: support application/octet-stream during pull
 2019-01-14 17:29:14 -05:00
Justin Terry (VM)
c5a8c9fc12 Fix issue in runhcs shim CloseIO 
The call was closing all upstream IO when a shim.CloseIO call was made rather
than just the Stdin as it is supposed to.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-14 13:31:28 -08:00
Justin Terry (VM)
31616e7945 Fix runhcs shim bug in Create with "len(Rootfs) == 0" 
Rootfs length can be set to zero if the upstream caller fully manages storage
and mounts on their own. In this case just treat the bundle as a fully complete
OCI spec and run it without doing any storage work in the shim.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-14 13:24:15 -08:00
Justin Terry (VM)
bcd4cc51c8 Fixes a bug in runhcs shim Exec.Pid 
When an exec occurs the pid was not properly updated on the in memory state
value causing many queries to see a 0.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-14 13:18:02 -08:00