Commit Graph

212 Commits

Author SHA1 Message Date
Shengjing Zhu
c6729fe0c4 Use ParseSignal and AtomicWriteFile functions from containerd
Containerd has its own ParseSignal and AtomicWriteFile implementation.
So there's no need to use these function from github.com/docker/docker.

Signed-off-by: Shengjing Zhu <i@zhsj.me>
2019-03-08 00:51:04 +08:00
Sebastiaan van Stijn
bc7d40057d
Update containerd to 4543e32a8b
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-08 16:12:28 +01:00
Sebastiaan van Stijn
0ad60d4d9e
Bump docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-07 13:02:37 +01:00
Lantao Liu
c27a12dd08 Update containerd to 5ba368748b.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -08:00
Lantao Liu
2baa96e0e2 Update kubernetes to v1.13.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-17 11:54:21 -08:00
Lantao Liu
2cc1edcfc3 Update containerd to 6937c5a3ba
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-04 01:53:10 -08:00
Lantao Liu
f818de9dce Update containerd to v1.2.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-11-12 11:12:41 -08:00
Lantao Liu
1f1e92e4a4 Update go-cni to 40bcf8ec8acd7372be1d77031d585d5d8e561c90.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-11 10:30:51 -07:00
Lantao Liu
2f42771f77 Update containerd to 15f19d7a67.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-08 14:32:00 -07:00
Lantao Liu
e3aa8adbb0 Update containerd to f88d3e5d6d.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-26 15:23:15 -07:00
Madhan Raj Mookkandy
5d777b2e35 Vendor in runtime-spec & runtime-tools from github.com/opencontainers
Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
2018-09-21 14:43:09 -07:00
Lantao Liu
f267f217cd Update containerd to 66b984ee33
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-13 16:31:32 -07:00
Lantao Liu
3da8bedb65 Update go-cni to 6d7b509a054a3cb1c35ed1865d4fde2f0cb547cd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-08-29 11:17:02 -07:00
Sebastiaan van Stijn
1d7f5f43b2
Use tagged versions for dependencies where possible
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-22 15:31:25 +02:00
Lantao Liu
58eb04550d
Merge pull request #873 from miaoyq/verify-selinux-level
Verify selinux level format
2018-08-13 18:57:01 -07:00
Yanqiang Miao
a87bda08c0 update selinux to b6fa367
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-08-14 08:33:43 +08:00
Lantao Liu
6379fd0346 Update containerd to b9eeaa1ce8.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-08-09 01:53:44 -07:00
Lantao Liu
7beac6fcc1
Merge pull request #849 from dmcgowan/remove-stringid
Replace stringid call with simple random reader
2018-07-12 18:32:28 -07:00
Derek McGowan
1984e451d5 Replace stringid with simple rand reader
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-12 16:40:45 -07:00
Lantao Liu
fb60d18fad Add missing vendor back.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-07-11 08:49:47 +00:00
Lantao Liu
1d9a754f6a Update containerd to b382b6fe0b.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-07-10 19:03:27 -07:00
Lantao Liu
952e53bf58 Add registry auth config, and use docker resolver in containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-07-09 19:08:48 -07:00
Lantao Liu
88c5165bfd Update containerd and k8s.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-06-27 23:08:00 +00:00
Lantao Liu
4eb4a29577
Merge pull request #825 from abhi/cni_config
Change to keep in sync with latest cni config
2018-06-21 16:14:31 -07:00
Abhinandan Prativadi
860971025f vendoring latest go-cni with fixes
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2018-06-21 20:43:51 +00:00
Filipe Brandenburger
01d77d44f5 Update github.com/opencontainers/runtime-tools to v0.6.0
Also add new dependencies on github.com/xeipuuv/gojson* (brought up by
new runtime-tools) and adapt the containerd/cri code to replace the APIs
that were removed by runtime-tools.

In particular, add new helpers to handle the capabilities, since
runtime-tools now split them into separate sets of functions for each
capability set.

Replace g.Spec() with g.Config since g.Spec() has been deprecated in the
runtime-tools API.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2018-06-20 13:52:50 -07:00
Lantao Liu
2b48f8738f Update kubernetes to v1.11.0-beta.2
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-06-08 07:26:35 +00:00
Akihiro Suda
097249054d vendor containerd (#2135)
For containerd/containerd#2135

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-02 23:10:59 +09:00
Evan Hazlett
d7d2212324 vendor bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

containerd: linux -> runtime/linux

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

fix utils to properly format vendor repo

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

test fixup

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 19:51:24 -04:00
Brian Goff
fb6bc66f0a Bump continuity to fix copy files > 2^32 bytes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-05-23 20:55:51 -04:00
Lantao Liu
80188e253a Update containerd to d1435e6e4d.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-05-23 10:16:33 -07:00
Lantao Liu
d77a0c117e Update containerd before release.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-23 10:04:53 -07:00
Lantao Liu
da285a10b9 Update containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-16 06:25:21 +00:00
Lantao Liu
68ef2c338e Update containerd to v1.1.0-rc.1
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-07 00:49:58 +00:00
Lantao Liu
55c54d118d Update containerd once before release.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 18:25:51 +00:00
Lantao Liu
ed20174ce4 Add RunAsGroup support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 22:26:07 +00:00
Lantao Liu
bb480ceabd Update cri-tools, containerd and kubernetes version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 00:45:01 +00:00
Lantao Liu
776929c52e Update containerd to 8a7e17ef96
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 23:03:00 +00:00
Lantao Liu
948d3132c9
Merge pull request #674 from abhi/master
Removing DAD config and updating plugins to v0.7.0
2018-03-16 16:32:01 -07:00
abhi
2bdf428eb7 Removing DAD config and updating plugins to v0.7.0
Signed-off-by: abhi <abhi@docker.com>
2018-03-16 14:46:46 -07:00
Lantao Liu
0b8e9060d7 Sync vendors with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-16 06:39:01 +00:00
Lantao Liu
1dcbf4f742
Merge pull request #663 from abhi/cni
Moving to use go-cni library from containerd
2018-03-15 17:53:50 -07:00
abhi
a1f4516661 Vendoring changes
Signed-off-by: abhi <abhi@docker.com>
2018-03-15 17:05:36 -07:00
Lantao Liu
62d1f13217 Update containerd to 3c1ef1a714
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-15 23:21:32 +00:00
Lantao Liu
edb38dfecc Update containerd to 3013762fc5
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-13 04:41:11 +00:00
Lantao Liu
31c377db6d Update containerd to 25c403415a.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 19:33:41 +00:00
Lantao Liu
45b6e75803 Update containerd to 129167132c.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-21 02:52:57 +00:00
Lantao Liu
a555bc25b9 Update kubernetes
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-09 07:42:54 +00:00
Mike Brown
6e1c57ec01 update runc vendor and containerd
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-08 19:01:48 -06:00
Lantao Liu
ae85d0ee81 Update kubernetes to 0caa20c65f147e15f5545862510eb7e81c42b0a3.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 02:45:44 +00:00
Lantao Liu
2acd6c1a5c
Merge pull request #599 from Random-Liu/update-ocicni
Update ocicni to main stream.
2018-02-07 13:47:12 -08:00
Lantao Liu
caf2bdb04a Update ocicni to main stream.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:39:06 +00:00
Lantao Liu
b776e696bd Update containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:17:26 +00:00
Lantao Liu
9f49134cc0 I rebased my fork, and ruin the previous commit...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-03 00:58:54 +00:00
Lantao Liu
b7c17ae06a
Merge pull request #585 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-02 13:18:51 -08:00
Stephen J Day
680bafea76
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-02 11:53:48 -08:00
Lantao Liu
d113c16802 Update ocicni to my fork.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 19:45:26 +00:00
Lantao Liu
a28672b088 Update containerd to fix mount.Lookup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:27:15 +00:00
Lantao Liu
23e872a44d Update containerd to ec15fe95aa.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-29 18:44:16 +00:00
Lantao Liu
635e5747c0 Update containerd and leverage plugin graceful stop.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 22:46:46 +00:00
Lantao Liu
31845714ef
Merge pull request #564 from Random-Liu/update-containerd
Update containerd to 4812f4be8f.
2018-01-23 14:10:21 -08:00
Lantao Liu
dd125be836 Update containerd to 4812f4be8f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 00:08:27 +00:00
Lantao Liu
2b6f084f36 Disable IPv6 dad by default.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-22 23:54:16 +00:00
Lantao Liu
b07017b93e Update containerd version to 90553efdef.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-12 22:34:39 +00:00
Lantao Liu
3d72cb857a Update vendor.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-11 19:10:41 +00:00
Lantao Liu
141f57065c Update vendors out of sync
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-05 01:17:45 +00:00
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