Commit Graph

13972 Commits

Author SHA1 Message Date
yanxuean
cb58bb885a solve incorrect unmount
1. add WithTempMount for better unmount and remove
2. solve incorrect unmount for
   diff.DiffMounts,
   diff.Apply,
   oci.WithUsername,
   oci.WithUserID,
   remapRootFS

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2018-01-06 00:28:16 +08:00
Michael Crosby
2b29a92a64 Hold shim lock during state
Helps with #1935

This hold the shim lock during the state call to make sure that the task
does not get deleted during a state call.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-05 11:13:47 -05:00
Phil Estes
8b6909f22f
Merge pull request #1964 from stevvooe/remove-silly-makefile-stuff
Makefile: no need to calculate GOOS
2018-01-05 10:41:38 -05:00
Phil Estes
7688af6f5b
Merge pull request #1963 from crosbymichael/cri-maintainers
Add cri-containerd maintainers and reviewers
2018-01-05 10:38:22 -05:00
Lantao Liu
aee7a366f3
Merge pull request #525 from abhi/cniip
Caching IP allocated by CNI plugin
2018-01-05 00:27:48 -08:00
Lantao Liu
360e8623ce
Merge pull request #523 from Random-Liu/compare-vendors
Sync vendors with containerd
2018-01-04 22:39:18 -08:00
abhi
f1dbc0b375 Caching IP allocated by CNI plugin
Signed-off-by: abhi <abhi@docker.com>
2018-01-04 20:00:55 -08:00
Stephen J Day
1c8911b1f1
Makefile: no need to calculate GOOS
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-04 17:30:01 -08: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
2b2011dafa Add script to sync vendors with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-05 01:17:45 +00:00
Lantao Liu
bc774a9108
Merge pull request #522 from Random-Liu/refactor-hack-utils
Refactor hack utils
2018-01-04 11:00:00 -08:00
Lantao Liu
e66e6d98df Add hack/utils.sh.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-04 18:22:12 +00:00
Phil Estes
ab7150f0ff
Merge pull request #1959 from containerd/netlify-config
Add build config for jekyll + netlify
2018-01-04 12:02:22 -05:00
Chris Aniszczyk
b12e5794b1 Force ruby version for docs build
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2018-01-04 10:49:50 -06:00
Phil Estes
c09086464e
Merge pull request #1958 from crosbymichael/roadmap
Update roadmap.md with issue labels and milestones
2018-01-04 10:55:59 -05:00
Michael Crosby
88685b0475 Update roadmap.md with issue labels and milestones
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-04 10:47:06 -05:00
Michael Crosby
121a0861cb Add cri-containerd reviewers
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-04 10:06:13 -05:00
Michael Crosby
18ed54e548 Add cri-containerd maintainers
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-04 10:01:03 -05:00
Daniel, Dao Quang Minh
5b931ca703
Merge pull request #1941 from crosbymichael/reviewers
Add concept of reviews and 2 new reviewers
2018-01-04 11:53:56 +00:00
Lantao Liu
ca2c92e512
Merge pull request #521 from Random-Liu/fix-install-deps
Fix install-deps
2018-01-04 01:08:57 -08:00
Lantao Liu
b3a4141ce5
Merge pull request #519 from Random-Liu/fix-vendor
Add missing vendor into vendor.conf.
2018-01-03 23:27:16 -08:00
Lantao Liu
d361ee5422 Fix install-deps
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-04 07:05:31 +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
Chris Aniszczyk
fea2c381b1 Add build config for jekyll + netlify
https://www.netlify.com/blog/2017/05/11/migrating-your-jekyll-site-to-netlify/

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2018-01-03 16:22:22 -06:00
Chris Aniszczyk
eeb5ea8cd4 Create CNAME 2018-01-03 14:40:48 -06:00
Michael Crosby
1a0c7ee8a0
Merge pull request #1955 from containerd/fix-website
Fix website rendering via gh-pages
2018-01-03 15:32:42 -05:00
Chris Aniszczyk
00ad7fe408
Fix website rendering via gh-pages
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-03 12:07:11 -08:00
Lantao Liu
5b82e3a934
Merge pull request #518 from Random-Liu/fix-privileged-caps
Fix privileged caps
2018-01-03 12:00:33 -08:00
Stephen Day
a85b1f85b7
Merge pull request #1956 from dnephin/use-clockwork-for-testing-gc
Small refactor of gc/scheduler to remove import of metadata
2018-01-03 11:56:17 -08:00
Daniel Nephin
06edd193ef Small refactor of gc/scheduler to remove import of metadata
Replace metadata.GCStats with an interface for exposing elapsed time

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-03 14:36:11 -05:00
Lantao Liu
31bc964195 Enable HostSpecific option in runtime-tools generator.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-03 19:04:47 +00:00
Michael Crosby
4e755ad383
Merge pull request #1947 from jessvalarezo/ctr-snapshot-diff
ctr: snapshots diff command
2018-01-03 11:34:29 -05:00
Michael Crosby
556c46d0a9
Merge pull request #1953 from jessvalarezo/diff-key-bug
rootfs: remove upper snapshot after use
2018-01-03 11:23:24 -05:00
Phil Estes
1d896a82c2
Merge pull request #1575 from Weichen81/arm-multi-arch
Fix pull-multi-arch images for Arm
2018-01-03 09:54:24 -05:00
Jess Valarezo
5bc0c43c73 rootfs: remove upper snapshot after use
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2018-01-02 21:23:35 -05:00
Jess Valarezo
625eb5e661 ctr: snapshots diff command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2018-01-02 21:18:12 -05:00
Derek McGowan
fdc9840e63
Revert "Emit unmodified change events for directories"
This reverts commit ba10e497b9.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-02 16:01:31 -08:00
Derek McGowan
c9dd974c27
Add parent directories to tar
Alternate solution which better accounts for hard links.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-02 16:01:31 -08:00
Michael Crosby
e479165a38
Merge pull request #1903 from darrenstahlmsft/ArchiveOpts
Implement Archive.apply on Windows
2018-01-02 16:08:36 -05:00
Lantao Liu
750115c812
Merge pull request #516 from Random-Liu/remove-default-rlimits
Remove default rlimits
2018-01-02 11:54:48 -08:00
Stephen Day
d8cf1f5120
Merge pull request #1945 from dmcgowan/nanosecond-time-and
fs: update nanosecond diff comparison
2018-01-02 11:06:54 -08:00
Lantao Liu
cebe1b39f7 Remove default rlimits.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-02 18:53:01 +00:00
Lantao Liu
5ef0b1857d
Merge pull request #513 from spiffxp/update-code-of-conduct
Update code-of-conduct.md
2018-01-02 09:23:22 -08:00
Aaron Crickenberger
ca9ef98bac Update code-of-conduct.md
Refer to kubernetes/community as authoritative source for code of conduct

Signed-off-by: Aaron Crickenberger <spiffxp@gmail.com>
2018-01-02 06:51:44 -08:00
Kenfe-Mickaël Laventure
3fa104f843
Merge pull request #1930 from crosbymichael/proc-exists
Check that process exists before it is returned
2017-12-27 13:05:47 -08:00
Derek McGowan
88d59d37fa
Update nanosecond diff comparison
Only check content of files if both files have zero nanosecond times.
A zero nanosecond time is considered ambiguous as to whether or
not the timestamp has been truncated by tar. Previously the diff
algorithm was attempting to account for comparisons from a source
to a directory with an applied tar. This condition is no longer
relevant since there is no support for recreating tars directories
which have had a tar extracted. In the case where the older directory
has a truncated timestamp and the newer one does not, this may always
be considered a change. In the case where both are zero, treat the
timestamp as ambiguous and compare content.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-12-26 14:17:03 -08:00
Lantao Liu
36f05dd552
Merge pull request #514 from Random-Liu/fix-docs
Fix kube-up document.
2017-12-21 17:48:25 -08:00
Lantao Liu
5c37f6dc63 Fix kube-up document.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-22 01:09:07 +00:00
Michael Crosby
ab30079e1b Add @dnephin and @jessvalarezo as reviewers
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-21 13:57:54 -05:00
Michael Crosby
33bc250920 Add concept of a review to containerd
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-21 13:40:49 -05:00