github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
976 Commits 3 Branches 2 Tags 112 MiB
22b1d526ce
Commit Graph

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
a7b78d7622 Merge pull request #297 from ijc/use-stat-for-device-uuid-comparison 
Use stat_t.st_rdev to compare block devices
 2017-09-28 11:30:34 -07:00
Lantao Liu
dc947114bb Cleanup flag default value 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 18:24:40 +00:00
Abhinandan Prativadi
1784b073bc Merge pull request #301 from Random-Liu/fix-container-stats 
Fix container stats.
 2017-09-28 06:02:42 -07:00
Lantao Liu
de6287d626 Fix container stats. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 05:49:44 +00:00
Lantao Liu
d6e04d871e Merge pull request #300 from Random-Liu/improve-some-error-message 
Better format several errors
 2017-09-27 22:47:15 -07:00
Lantao Liu
517f697f62 Better format several errors 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 01:15:06 +00:00
Lantao Liu
e723a5018b Merge pull request #293 from Random-Liu/cleanup-container-metrics 
Fix and cleanup container metrics
 2017-09-27 17:17:46 -07:00
Lantao Liu
97b6e82d98 Fix and cleanup container metrics 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-27 23:43:00 +00:00
Abhinandan Prativadi
cc5d3ef96a Merge pull request #296 from abhinandanpb/stats_time 
Setting the cpu and memory stats of containers in nanoseconds
 2017-09-27 09:22:56 -07:00
Ian Campbell
11714fb6a3 Use stat_t.st_rdev to compare block devices 
I implemented /dev/disk/by-uuid on my platform but using absolute links (where
udev typically uses relative) which broke the code in `os.DeviceUUID`.

Rather than just patch that up directly instead stat both the target and
candidate devices and pick one with matching major:minor in st_rdev. This saves
manually building paths to resolve symlinks and I think should be more robust
overall.

I also removed the initial stat of /dev/disk/by-uuid, I believe
`ioutil.Readdir` will correctly return an error if the path does not exist.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-27 16:17:57 +01:00
Abhinandan Prativadi
66693196ac Setting timestamp for cpu and memory stats in nano seconds 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-27 07:06:25 -07:00
Lantao Liu
0e6e593481 Merge pull request #275 from mikebrow/config-for-containerd 
Adds support for configuring the containerd runtime engine
 2017-09-26 20:04:13 -07:00
Mike Brown
d8a3c6b018 adds support for configuring the containerd runtime engine 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-26 20:22:51 -05:00
Lantao Liu
e7a5001c3e Merge pull request #265 from abhinandanpb/metrics 
Adding container metrics support
 2017-09-26 13:57:17 -07:00
Lantao Liu
78190d6228 Merge pull request #284 from abhinandanpb/master 
Ansible Cleanup: Combining few tasks into one
 2017-09-26 13:23:17 -07:00
Abhinandan Prativadi
0ee33fda03 Combining few tasks into one 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-26 12:12:00 -07:00
Abhinandan Prativadi
853804bd8e Adding integration test for container stats 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-26 12:03:15 -07:00
Abhinandan Prativadi
d0298944eb Adding container metrics 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-26 12:03:08 -07:00
Abhinandan Prativadi
b23165cb29 Merge pull request #282 from Random-Liu/fix-ansible-playbook 
Improve ansible playbook.
 2017-09-26 10:49:21 -07:00
Lantao Liu
ea442fb669 Merge pull request #290 from Random-Liu/add-systemd-cgroup-support 
Add systemd cgroup support.
 2017-09-26 09:39:21 -07:00
Mike Brown
57d1be5997 Merge pull request #291 from ijc/contrib-linuxkit 
contrib: add reference to LinuxKit project
 2017-09-26 11:06:41 -05:00
Ian Campbell
99d4757ce6 contrib: add reference to LinuxKit project 
Just a simple README with a pointer to the project.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-26 10:52:33 +01:00
Lantao Liu
cd57d063c5 Add systemd cgroup support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-26 06:44:30 +00:00
Lantao Liu
86ee919013 Merge pull request #285 from Random-Liu/no-cni-in-release-tarball 
Do not include CNI binaries/configs in release tarball.
 2017-09-25 19:18:06 -07:00
Lantao Liu
064f21d4b2 Merge pull request #281 from Random-Liu/check-seccomp-enable 
Check seccomp enable and add unit test for seccomp/apparmor.
 2017-09-25 18:29:53 -07:00
Lantao Liu
d1f0ac92c5 Do not include CNI binaries/configs in release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-25 23:43:32 +00:00
Lantao Liu
4231473df3 Address comments 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-25 23:09:44 +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
c83af81403 Merge pull request #279 from abhinandanpb/readme 
Getting started guide
 2017-09-25 16:06:32 -07:00
Lantao Liu
994df4cb7c Improve ansible playbook. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-25 22:39:04 +00: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