Commit Graph

96 Commits

Author SHA1 Message Date
Lantao Liu
60e0e7bd57 Add missing vendor into vendor.conf.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-04 03:06:46 +00:00
Lantao Liu
282e906b5c Update containerd to 6c7abf7c76c1973d4fb4b0bad51691de84869a51.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-15 19:51:02 +00:00
Lantao Liu
db5563abd3 Update containerd to v1.0.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-06 04:06:00 +00:00
Lantao Liu
0d8298aa43 Update containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-04 19:18:45 +00:00
Lantao Liu
e0e5d9e139 Update containerd to try fix rootfs issue.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-02 00:09:04 +00:00
Lantao Liu
eb6cca3c49 Revert "Add gc.root back in vendored containerd client."
This reverts commit 66ecfa70ad.

Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 18:43:32 +00:00
Lantao Liu
66ecfa70ad Add gc.root back in vendored containerd client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 04:37:40 +00:00
Lantao Liu
b47770eaee Update containerd to fix fd leakage.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 00:24:44 +00:00
Lantao Liu
0db6e04ba1
Merge pull request #447 from Random-Liu/update-containerd
Update containerd to fix long exec issue.
2017-11-30 12:58:24 -08:00
Lantao Liu
5ed43ea1a3 Update containerd to fix long exec issue.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-30 19:24:14 +00:00
yanxuean
9a03957090 upgrade protobuf and grpc
fix #435

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-29 09:44:17 +08:00
Lantao Liu
5f0fba4204 Update containerd and add synchronous image deletion.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-28 22:44:25 +00:00
Daniel Nephin
bf5f17ac1e Update containerd vendor
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-28 14:09:58 -05:00
Lantao Liu
2e3c510c92 Update containerd to 70e0c8443f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-27 19:24:14 +00:00
yanxuean
50cb8a0571 update containerd for refactor
fix #423

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-27 19:24:14 +00:00
Lantao Liu
9e6d607aae Update containerd to v1.0.0-beta.3
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 21:08:09 +00:00
Lantao Liu
c2796dfab3
Merge pull request #384 from Random-Liu/update-containerd
Update containerd to 564600ee79.
2017-11-02 15:59:50 -07:00
Mike Brown
df6f4a3655 adds help for load command (#383)
* adds help for load command

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* vendor restrom/dedent

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-11-02 15:38:24 -07:00
Lantao Liu
1d61b7464b Update containerd to 564600ee79.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-02 22:17:38 +00:00
yanxuean
9027a02e8e Use image.IsUnpacked
fix #361
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-01 13:51:25 +08:00
Lantao Liu
c6fd18ddc3 Update cobra and pflag
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 06:42:18 +00:00
Lantao Liu
8fb63c5664 Merge pull request #356 from Random-Liu/change-to-cli
Change to cli
2017-10-25 05:48:52 +02:00
Lantao Liu
7977970e04 Use cobra for cli.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-25 00:19:37 +00:00
w9n
1a6be2b573 update containerd, runc, cgroups, sys and docker version
Signed-off-by: w9n <w9ncontact@gmail.com>
2017-10-24 22:52:29 +02:00
Lantao Liu
61d598d00f Merge pull request #235 from yanxuean/truncindex
Add Truncindex for container, sandbox and image
2017-10-11 21:03:16 -07:00
yanxuean
5ee3423820 add truncindex
fix #222

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-12 10:32:20 +08:00
Lantao Liu
bde8b0517e Update kubernetes and containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-11 06:16:19 +00:00
Lantao Liu
f7eaa29c67 Update containerd to 8558b98eb1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-06 01:40:39 +00:00
Lantao Liu
21233b22be Check seccomp enable and add unit test for seccomp/apparmor.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 23:09:26 +00:00
Lantao Liu
f7f944235b Update containerd to v1.0.0-beta.1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-23 01:00:11 +00:00
Lantao Liu
6363207315 Merge pull request #272 from Random-Liu/improve-selinux-apparmor-support
Improve apparmor and selinux support.
2017-09-22 15:09:59 -07:00
Lantao Liu
dd967cde8c Improve apparmor and selinux support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 20:46:31 +00:00
Lantao Liu
1fd8c2ffc3 Merge pull request #270 from Random-Liu/fix-checkpoint-recovery
Fix checkpoint recovery.
2017-09-22 00:48:00 -07:00
Mike Brown
78a925f57b vendor for new seccomp helpers
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-21 17:37:50 -05:00
Lantao Liu
ce9d27bd94 Fix checkpoint recovery.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 21:10:38 +00:00
Lantao Liu
55a088763e Merge pull request #266 from Random-Liu/update-ocicni
Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e
2017-09-20 16:42:24 -07:00
Lantao Liu
2907566565 Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-20 21:58:18 +00:00
Lantao Liu
a2dbc6ec1c Merge pull request #261 from ijc/volume-copyup
Implement volume copy up.
2017-09-20 02:30:36 -07:00
Ian Campbell
8c6ba35038 Implement volume copy up.
This pulls in and uses github.com/docker/docker/pkg/chrootarchive for the
actual copy up which is some battle hardened code to unpack avoiding things
like symlink traversal security issues.

However it does pull in a pretty huge pile of vendoring, including
github.com/docker/docker/pkg/reexec which we must then call at startup. It's
not immediately clear that this tradeoff is the correct one.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 09:52:27 +01:00
Lantao Liu
5af5a04b6f Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-20 01:31:26 +00:00
Lantao Liu
91ca178275 Update containerd to include the gcr private registry fix
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-18 18:19:26 +00:00
Mike Brown
8310fb4bfd update vendor
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-14 12:24:00 -05:00
Lantao Liu
b074388460 Update containerd to v1.0.0-beta.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-09 04:46:02 +00:00
Lantao Liu
777f001432 Merge pull request #200 from yanxuean/tomlconfig
Add config file for cri-containerd
2017-09-07 10:36:32 -07:00
yason
e1a8968f5a add config file for cri-containerd
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-07 15:07:47 +08:00
Lantao Liu
1c0385a650 Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:01 +00:00
Lantao Liu
e06c2c59e0 Merge pull request #179 from Random-Liu/checkpoint-container-status
Checkpoint container status onto disk.
2017-09-06 13:51:38 -07:00
Mike Brown
8a21e3f3c8 Merge pull request #206 from Random-Liu/ensure-remove-all
Use EnsureRemoveAll
2017-09-05 18:43:45 -05:00
Lantao Liu
2bf31ee08c Update vendor to include /docker/docker/pkg/system
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-05 20:28:53 +00:00
yanxuean
269aeb6734 add config file -- add despendency
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-05 16:20:02 +08:00