github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,706 Commits 3 Branches 2 Tags 112 MiB
6be7c9f4e2
Commit Graph

8706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
003b27eff4
Move compression benchmark test data to gist 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2018-09-17 13:41:04 -07:00
Maksym Pavlenko
4d7d63f390
Improve layer decompression speed by using pigz 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2018-09-17 13:41:04 -07:00
Lantao Liu
65283e4253 The indent is wrong. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-17 12:11:18 -07:00
Lantao Liu
ab9942cbf9 Update cri to 9f39e32895. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-17 11:37:24 -07:00
Derek McGowan
d09a1c6a95
Merge pull request #2655 from crosbymichael/slack 
Update slack invite link for direct signup
 2018-09-17 11:35:52 -07:00
Lantao Liu
9f39e32895
Merge pull request #919 from Random-Liu/update-cri-tools 
Update cri-tools to 98eea54af789ae13edce79cba101fb9ac8e7b241.
 2018-09-17 11:20:10 -07:00
Michael Crosby
0f99d24d3d Update slack invite link for direct signup 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-17 14:12:23 -04:00
Lantao Liu
3de8c8bf19 Update cri-tools to 98eea54af789ae13edce79cba101fb9ac8e7b241. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-17 10:54:42 -07:00
Lantao Liu
31a960fb58
Merge pull request #918 from Random-Liu/show-runtime-handler-in-sandbox-info 
Show runtime handler in sandbox debug info.
 2018-09-17 10:43:51 -07:00
Lantao Liu
46b8f4290b
Merge pull request #912 from Random-Liu/add-hostname-env-integration-test 
Add hostname env integration test.
 2018-09-17 10:42:46 -07:00
Lantao Liu
4b45e16a4b Show runtime handler in sandbox debug info. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-16 21:27:51 -07:00
Lantao Liu
c7c68993c7 Add hostname env integration test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-16 20:32:18 -07:00
Derek McGowan
0dc7636c0b
Merge pull request #2644 from madhanrm/vendor_win 
Vendor in runtime spec referencing windows namespace
 2018-09-14 18:06:29 -07:00
Derek McGowan
074459cb51
Merge pull request #2651 from estesp/travis-darwin-cleanup 
Remove setup steps unnecessary when travis runs on darwin
 2018-09-14 15:29:30 -07:00
Derek McGowan
bce20b75da
Simplify docker importer 
Support any layout and rely on manifest.json to reference blobs

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:27 -07:00
Derek McGowan
9e6db71954
Add docker importer 
Update ctr to support all formats by default

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:26 -07:00
Derek McGowan
f57c5cdefb
Refactor image importer 
Allow customization of reference creation.
Add option for digest references.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:26 -07:00
Phil Estes
85e8221f10
Tests should set up snapshot prior to any use of fs 
These tests would have failed if any image had a USER declaration in it,
but because the test image never has, these were never caught. Adding
supplemental GIDs on any image revealed the issue.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-09-14 14:36:01 -04:00
Lantao Liu
e402ae2f02
Merge pull request #914 from Random-Liu/fix-addition-gids 
Fix addition gids
 2018-09-14 10:30:41 -07:00
Phil Estes
13931e41d6
Add additional GIDs by default if they exist in /etc/group 
If we are using an image config, we should by default add any additional
GIDs that are found from reading /etc/group, even if the default user is
root.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-09-14 13:28:50 -04:00
Phil Estes
b215a65f7d
Remove setup steps unecessary when travis runs on darwin 
Many of the setup/dev programs installed are not used because no testing
is executed on GOOS=darwin builds. Makes sense to remove them and make
darwin runs much shorter.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-09-14 13:16:22 -04:00
Phil Estes
c28ce39cea
Add flag to ctr for running with NoNewPrivileges: false 
Add flag and With-helper to set NoNewPrivileges to false since it is on
by default in the default UNIX spec for containerd, but off by default
in Docker and CRI plugin use. This allows for easy testing with it off
for comparison.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-09-14 11:03:58 -04:00
Phil Estes
05984a966d
Merge pull request #2642 from dmcgowan/fix-commit-already-exists 
Fix content store bug when already exists
 2018-09-14 09:09:22 -04:00
Derek McGowan
6875d3df3a
Always check exists on commit error 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 01:26:03 -07:00
Madhan Raj Mookkandy
744d93e960 Vendor in runtime spec referencing windows namespace 
Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
 2018-09-13 18:03:18 -07:00
Michael Crosby
c95bb88fa3
Merge pull request #2634 from jhowardmsft/boltdb 
Move to supported boltdb
 2018-09-13 20:42:00 -04:00
Derek McGowan
c0cb2f2568
Add testcase for commit already exist 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-13 17:38:28 -07:00
Lantao Liu
51ee6ea6dc Add integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-13 16:31:32 -07:00
Lantao Liu
ca3b806b5c Fix addition group ids. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-13 16:31:32 -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
Michael Crosby
1950f791d9
Merge pull request #2641 from Random-Liu/support-uid-in-additional-group 
Support uid in WithAdditionalGIDs.
 2018-09-13 18:51:22 -04:00
Michael Crosby
49af788996
Merge pull request #2621 from jianliao82/patch-2 
fix typo
 2018-09-13 15:56:10 -04:00
Lantao Liu
178db322b3 Support uid in WithAdditionalGIDs. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-13 10:51:14 -07:00
liaojian
0120dec799 fix typo 
fix typo
Signed-off-by: jian liao <jliao@alauda.io>
 2018-09-13 10:51:07 +08:00
John Howard
8e44270723 Adds a no-op migration for metadata v3 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-09-12 15:33:42 -07:00
John Howard
f1cc4feea6 Vendor go.etcd.io/bbolt @ v1.3.1-etcd.8 
Signed-off-by: John Howard <jhoward@microsoft.com>

This is the maintained version of boltdb, which includes the Windows-specific fix
detailed in https://github.com/etcd-io/bbolt/pull/122
 2018-09-12 15:32:13 -07:00
John Howard
2586f3fbb9 boltdb/bolt --> go.etcd.io/bbolt 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-09-12 15:23:57 -07:00
Derek McGowan
66b984ee33
Merge pull request #2638 from crosbymichael/daemon-root 
Don't start top container in test
 2018-09-12 10:32:11 -07:00
Michael Crosby
700d8d3aa8 Don't start top container in test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-12 11:23:24 -04:00
Phil Estes
bb0f83ab6e
Merge pull request #2636 from justincormack/update-yaml 
Update Go yaml library
 2018-09-12 10:37:03 -04:00
Phil Estes
18ae712942
Merge pull request #2627 from estesp/supplemental-groups 
Add With-helper for supplemental gid support
 2018-09-12 10:27:41 -04:00
Justin Cormack
5271d93086
Update Go yaml library 
This has releases, and the vendored version is very old predating
the change from LGPL to Apache licensing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2018-09-12 13:41:32 +01:00
Phil Estes
78e61af47a
Add With-helper for supplemental gid support 
Can be used to conform to Docker engine behavior of adding additional
GIDs to spec when found in /etc/group of image filesystem

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-09-11 23:01:15 -04:00
Lantao Liu
3e5eb0c7d5
Merge pull request #911 from Random-Liu/sctp-support 
Skip sctp protocol hostport mapping.
 2018-09-11 17:22:47 -07:00
Lantao Liu
f540c2a74d Skip sctp protocol hostport mapping. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-11 16:32:15 -07:00
Michael Crosby
83668f424f
Merge pull request #2630 from crosbymichael/install-path 
Add optional install path
 2018-09-11 16:45:16 -04:00
Lantao Liu
0470309270
Merge pull request #908 from Random-Liu/update-kubernetes 
Update kubernetes to v1.12.0-beta.1.
 2018-09-11 11:12:55 -07:00
Michael Crosby
60d13d63c4 Add optional install path 
This allows users to consume the install functionality but also install
to other areas instead of the managed `/opt` dir.

```bash
> ctr install --path /usr/local
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-11 10:36:00 -04:00
Phil Estes
ed2bf6dd8a
Merge pull request #2624 from Ace-Tang/fix_delete_lock 
fix: modify lock location of exec delete avoid exec hang
 2018-09-11 10:26:32 -04:00
Ace-Tang
079292e3fc fix: modify lock location of exec delete 
func (e *execProcess) delete(ctx context.Context) error {
    e.wg.Wait()
...
}
delete exec process will wait for io copy finish, if wait here,
other process can not get lock of shim service.

1. apply lock around s.transition() calls in the Delete methods.
2. put lock after wait io copy in exec Delete.

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-09-11 13:22:59 +08:00