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

1958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Brown
eb67aa5960
Merge pull request #1156 from Random-Liu/make-sure-exec-kill 
Make sure exec process is killed when context is canceled.
 2019-05-29 23:22:51 +02:00
Johannes M. Scheuermann
4f0948eed5 Remove capitalized letter in error message 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-29 08:20:21 +02:00
Lantao Liu
d257c16dbc Make sure exec process is killed when context is canceled. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-28 12:25:03 -07:00
Mike Brown
ac9f8e1c4d
Merge pull request #1153 from jterry75/max_search_error 
Update parseDNSOptions maxDNSSearches in error message
 2019-05-26 15:51:01 +02:00
Justin Terry (VM)
f544955e4a Update parseDNSOptions maxDNSSearches in error message 
Minor correctness. We should use the value of the const in the error message
instead of hard coding it in the string so if maxDNSSearches ever changes so
does the error.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-24 14:42:56 -07:00
Johannes M. Scheuermann
0d439c3474 Implement bandwidth capabilties 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-24 10:29:52 +02:00
Johannes M. Scheuermann
42eb3c49af Initial support for traffic shaping 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-24 09:01:02 +02:00
Lantao Liu
6e14e01307
Merge pull request #1148 from congliu01/log 
Override container log path to empty if either of sandbox log directory or container log path is empty.
 2019-05-14 15:50:20 -07:00
Cong Liu
fda2902f30 Validate log paths in sandbox and container config. 
Only compose full container log path if neither of the paths is empty. Otherwise container won't start properly.

Signed-off-by: Cong Liu <conliu@google.com>
 2019-05-14 13:46:52 -04:00
Lantao Liu
ebce49f0ea
Merge pull request #1145 from jterry75/fix_typo 
Fix typo in WithoutRunMount
 2019-05-12 23:55:06 -07:00
Justin Terry (VM)
8ba5c02f8f Fix typo in WithoutRunMount 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-10 13:30:22 -07:00
Lantao Liu
179ca59478
Merge pull request #1147 from jterry75/unix_to_syscall_signal 
Move from unix to syscall package for SIG* signals
 2019-05-10 13:14:10 -07:00
Lantao Liu
d6af03abbd
Merge pull request #1146 from jterry75/forward_sandbox_to_pull 
Forward sandbox config to PullImage request
 2019-05-10 12:10:30 -07:00
Justin Terry (VM)
c1468cdeec Move from unix to syscall package for SIG* signals 
To support cross compilation for SIG* signals perfer the syscall package over
the unix package.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-10 11:50:45 -07:00
Justin Terry (VM)
bc445d7595 Forward sandbox config to PullImage request 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-10 11:35:09 -07:00
Mike Brown
e4ebb718c6
Merge pull request #1142 from Random-Liu/better-logging-for-registry-try 
Log failed registry mirror attempt in debug.
 2019-05-09 10:04:42 -04:00
Lantao Liu
4037806184 Log failed registry mirror attempt in debug. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-08 23:56:29 -07:00
Lantao Liu
51910edf0d
Merge pull request #1140 from lifupan/fix_taskdelete 
Integration test task.Delete fix
 2019-05-08 18:21:20 -07:00
lifupan
47fc645682 Integration test task.Delete fix 
task.Delete() will try to kill the task before delete it,
but once the task is killed, the TaskExit event will also
tigger another task.Delete() which would conflict with this
test task.Delete(). To avoid this conflict, kill the task instead
of Delete it, and let TaskExit trigger task.Delete().

Signed-off-by: lifupan <lifupan@gmail.com>
 2019-05-08 12:28:22 +08:00
Lantao Liu
82ff9372ad
Merge pull request #1137 from Random-Liu/per-pod-shim 
Use per-pod shim.
 2019-04-29 15:36:34 -07:00
Lantao Liu
1626663e24 Include new go.mod file. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-29 14:06:57 -07:00
Lantao Liu
091182fdca Use per-pod shim. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-29 13:49:59 -07:00
Lantao Liu
2fc62db814
Merge pull request #1125 from Random-Liu/add-default-runtime-name 
Add default runtime name
 2019-04-25 18:48:33 -07:00
Lantao Liu
db90808477 Update doc and add deprecation policy for CRI options. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-25 16:11:16 -07:00
Lantao Liu
ba4a04ae70 Add DefaultRuntimeName option. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-18 11:18:25 -07:00
Lantao Liu
a5c5d55c90
Merge pull request #1133 from Random-Liu/use-wait 
Use wait instead of `TaskExit`.
 2019-04-18 11:10:21 -07:00
Lantao Liu
d1f9611cb0 Use wait instead of TaskExit. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-18 00:18:26 -07:00
Lantao Liu
f207148811
Merge pull request #1134 from Random-Liu/use-ctr-import 
Use ctr images import.
 2019-04-16 12:09:24 -07:00
Lantao Liu
19e2b20c13 Use ctr images import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-15 10:37:31 -07:00
Lantao Liu
a7021d687a
Merge pull request #1135 from Random-Liu/update-containerd 
Update containerd
 2019-04-12 16:07:12 -07:00
Lantao Liu
34754d4337 Add cri as required plugin. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-12 15:15:38 -07:00
Lantao Liu
603972523e Update containerd to 32e788a8be. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-12 15:13:45 -07:00
Lantao Liu
42aaca565a
Merge pull request #1129 from Random-Liu/use-v1-for-now 
Use runc.v1 for now for debugging.
 2019-04-11 10:46:09 -07:00
Lantao Liu
fa759f6a1b
Merge pull request #1130 from Random-Liu/fix-status-hang 
Update go-cni to 891c2a41e18144b2d7921f971d6c9789a68046b2.
 2019-04-10 14:35:33 -07:00
Lantao Liu
e425bd019a Update go-cni to 891c2a41e18144b2d7921f971d6c9789a68046b2. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-10 12:07:59 -07:00
Lantao Liu
5e3de1f43a Use runc.v1 for now for debugging. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-09 10:58:59 -07:00
Lantao Liu
ebb0928057
Merge pull request #1124 from Random-Liu/use-golang-1-11-6 
Use golang 1.11.6 for now.
 2019-04-08 14:30:13 -07:00
Lantao Liu
c20ba1ef11 Use golang 1.11.6 for now. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-08 08:55:30 -07:00
Lantao Liu
d90e060462
Merge pull request #1121 from Random-Liu/update-containerd 
Update containerd to 591e52c504.
 2019-04-05 12:39:48 -07:00
Lantao Liu
bf112b3c2b Update containerd 591e52c504. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-05 11:39:34 -07:00
Lantao Liu
e8e3b9425b
Merge pull request #1118 from Random-Liu/support-comment-in-vendor 
Support comment in vendor.
 2019-04-05 10:51:36 -07:00
Lantao Liu
a022ddfcca Support comment in vendor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-05 10:00:17 -07:00
Lantao Liu
6d353571e6
Merge pull request #1116 from Random-Liu/per-pod-shim 
Enable runc.v2 as the default runtime in test.
 2019-04-04 09:49:01 -07:00
Mike Brown
0e2afb63ac
Merge pull request #1113 from thaJeztah/bump_selinux 
bump opencontainers/selinux v1.2.1
 2019-04-04 07:51:08 -05:00
Sebastiaan van Stijn
5e7d59fc9d
bump opencontainers/selinux v1.2.1 
full diff: opencontainers/selinux@v1.2...v1.2.1

brings in opencontainers/selinux#49 Ignore attempts to setLabels "" on SELinux disabled systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-04 09:33:38 +02:00
Lantao Liu
63ad4c7305
Merge pull request #1114 from Random-Liu/fix-extra-handler 
Use local env to avoid writing to passed-in readonly env.
 2019-04-03 18:48:37 -07:00
Lantao Liu
fae4f79060 Enable runc.v2 as the default runtime in test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-03 18:47:25 -07:00
Lantao Liu
ebca0c4d4e Use local env to avoid writing to passed-in readonly env. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-03 16:54:43 -07:00
Lantao Liu
b23b406fed
Merge pull request #1102 from Random-Liu/uts-namespace-and-fix-array 
Uts namespace and fix array
 2019-04-01 09:22:37 -07:00
Lantao Liu
32dd6595cd
Merge pull request #1108 from Random-Liu/update-cni 
Update CNI to v0.7.5.
 2019-03-29 12:40:38 -07:00