Commit Graph

447 Commits

Author SHA1 Message Date
Lantao Liu
c83af81403 Merge pull request #279 from abhinandanpb/readme
Getting started guide
2017-09-25 16:06:32 -07:00
Lantao Liu
b9200ac403 Merge pull request #257 from Random-Liu/add-image-stats
Add image stats and integration test
2017-09-25 15:35:30 -07:00
Abhinandan Prativadi
0e51486ec9 Update README.md
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-25 14:05:04 -07:00
Abhinandan Prativadi
300f0cf89e Create a getting started guide for users
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-25 14:04:54 -07:00
Lantao Liu
8fb57da18e Add integration test framework
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 21:02:30 +00:00
Lantao Liu
491400c892 Add ImageFsInfo support
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 21:02:29 +00:00
Lantao Liu
b1b925d7e4 Merge pull request #280 from Random-Liu/update-testing-doc
Update testing doc
2017-09-25 11:07:28 -07:00
Lantao Liu
cfe365198b Update testing doc
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-24 03:27:10 +00:00
Mike Brown
529971a1dd Merge pull request #278 from Random-Liu/update-containerd
Update containerd to v1.0.0-beta.1
2017-09-23 12:08:05 -05: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
b15172faea Merge pull request #277 from Random-Liu/add-ip-forward
Add net.ipv4.ip_forward=1 and use ansible sysctl.
2017-09-22 17:10:03 -07:00
Lantao Liu
b85be3d0cd Import CRI remote client package.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 23:37:58 +00:00
Lantao Liu
b2dcb9f3ec Add net.ipv4.ip_forward=1 and use ansible sysctl.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 23:36:12 +00:00
Abhinandan Prativadi
2dae863f87 Merge pull request #276 from abhinandanpb/master
Fixing ansible playbook for centos installation
2017-09-22 15:19:35 -07: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
39b11d6d57 Merge pull request #274 from Random-Liu/use-systemd-units-in-tar
Use systemd units in tar
2017-09-22 15:09:23 -07:00
Abhinandan Prativadi
ffd2e0e32e Fixing ansible playbook for centos installation
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-22 17:50:41 -04:00
Lantao Liu
7ab54a00da Use systemd units in tar.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 21:28:36 +00: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
73a5f7d9b1 Merge pull request #273 from abhinandanpb/cri_cleanup
Adding cri reset script for resetting the states
2017-09-22 13:21:38 -07:00
Abhinandan Prativadi
8fd19d4ed0 Adding cri reset script for resetting the states
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-22 11:37:44 -07: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
Lantao Liu
10df5f71a7 Merge pull request #212 from miaoyq/related-selinux
Add build tags and Improve the test case of selinux
2017-09-21 21:07:53 -07:00
Yanqiang Miao
7096027d21 Add build tags and Improve the test case of selinux
- Add build tags
- Fixes a bug because of my negligence
- Improve the test case of selinux

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

test
2017-09-22 11:39:32 +08:00
Lantao Liu
b50f06bb5b Merge pull request #234 from abhinandanpb/installer
kubernetes + cri-containerd + containerd installer
2017-09-21 18:12:19 -07:00
Lantao Liu
411c03b5c6 Merge pull request #219 from mikebrow/seccomp
Adds seccomp support
2017-09-21 16:06:25 -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
Mike Brown
c0a2d152d9 adds seccomp support
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-21 17:22:11 -05:00
Lantao Liu
2ac9262091 Merge pull request #271 from Random-Liu/register-name-after-recover
Should register container/sandbox name after restart.
2017-09-21 15:10:39 -07: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
e132f9c1ea Should register container/sandbox name after restart.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 21:06:24 +00:00
Lantao Liu
9015b6ec68 Merge pull request #209 from Random-Liu/checkpoint-recovery
Checkpoint recovery
2017-09-21 11:32:49 -07:00
Lantao Liu
cc1b0b6709 Add restart recovery logic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 17:59:46 +00:00
Abhinandan Prativadi
bafc7be9be kubernetes + containerd installer
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-20 22:32:09 -07:00
Lantao Liu
90d6e44c22 Merge pull request #267 from Random-Liu/fix-apparmor
Fix apparmor empty case.
2017-09-20 21:53:28 -07:00
Lantao Liu
dd3421c3c7 Fix apparmor empty case.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 04:07:39 +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
5dbba596e6 Merge pull request #260 from yanxuean/use-containerd-extension
Switch to containerd extension
2017-09-20 10:36:57 -07:00
Abhinandan Prativadi
f3426cd6b9 Merge pull request #256 from abhinandanpb/crictl
Adding crictl to install deps
2017-09-20 09:25:33 -07:00
yanxuean
e1a7a0ea76 Switch to containerd extension
fix #251

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-21 00:15:10 +08:00
Abhinandan Prativadi
e4077e915b Add crictl cli to install deps
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-20 07:38:29 -07:00
Lantao Liu
a2dbc6ec1c Merge pull request #261 from ijc/volume-copyup
Implement volume copy up.
2017-09-20 02:30:36 -07:00
Lantao Liu
9c533dca14 Merge pull request #262 from ijc/sandbox-getip-improvements
Do not attempt to retrieve IP from host network namespace
2017-09-20 02:22:07 -07:00
Ian Campbell
9c3c38d9ab Do not attempt to retrieve IP from host network namespace
Since sandboxes which use the host network have no network namespace path this
would result in an invalid invocation of nsenter.

Rework the fetching of the sandbox to take this into account and also avoid
trying to get an IP when the network plugin is not yet ready.

Fixes #245.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 09:53:56 +01: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
9d8f74227f Merge pull request #264 from Random-Liu/update-kubernetes
Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace
2017-09-19 21:26:22 -07: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
3647ff5976 Merge pull request #263 from Random-Liu/fix-log
Fix one line of log, we are writing not reading.
2017-09-19 13:24:28 -07:00
Lantao Liu
45f98a0b39 Fix one line of log, we are writing not reading.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-19 18:53:45 +00:00