github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
4,172 Commits 3 Branches 2 Tags 112 MiB
40caece8dc
Commit Graph

4172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Crosby
83668f424f
Merge pull request #2630 from crosbymichael/install-path 
Add optional install path
 2018-09-11 16:45:16 -04: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
Michael Crosby
1597270d04
Merge pull request #2579 from lifubang/ctrrun 
fix when --config provided, don't need Image/RootFS
 2018-09-10 13:09:08 -04:00
Michael Crosby
12c877f57a
Merge pull request #2618 from crosbymichael/no-stdin 
Don't provide IO when it's not set
 2018-09-10 11:26:49 -04:00
Michael Crosby
18d9e43bd1
Merge pull request #2623 from yanxuean/move-task-opts 
move WithXXXX to task_opts.go
 2018-09-10 09:39:25 -04:00
Michael Crosby
c48cafea40
Merge pull request #2619 from nashasha1/fix/typo-in-runtime 
Fix some typo in runtime and snapshots
 2018-09-10 09:32:34 -04:00
Phil Estes
804bf73a07
Merge pull request #2625 from kadisi/import_export 
move Exports method to export.go files
 2018-09-10 09:11:52 -04:00
Jie Zhang
c11e2b8d44 move Exports method to export.go files 
Signed-off-by: Jie Zhang <iamkadisi@163.com>
 2018-09-10 17:13:44 +08:00
yanxuean
3c8692a1a9 move WithXXXX to task_opts.go 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2018-09-10 15:24:01 +08:00
Xiaodong Zhang
e6d787172c Fix some typo in runtime and snapshots 
Signed-off-by: Xiaodong Zhang <a4012017@sina.com>
 2018-09-08 08:31:42 +08:00
Michael Crosby
906acb18b6 Don't provide IO when it's not set 
This makes sure that runc does not get any valid IO for the pipe.  Some
builds and other containers will be stuck if they inspect stdin
expecially and its a pipe but not connected to any user input.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-07 18:30:31 -04:00
Phil Estes
6ca8355a4e
Merge pull request #2615 from tossmilestone/fix-forward-typo 
Fix 'forward' typos
 2018-09-07 14:51:35 -04:00
Phil Estes
b5274fe48a
Merge pull request #2610 from jterry75/fixup_oci_default_lcow 
Add a Windows section for Linux oci on LCOW
 2018-09-07 07:58:47 -04:00
Michael Crosby
55952ad087
Merge pull request #2612 from nashasha1/fix/contrib-typo 
Fix typo in contirb dir
 2018-09-07 07:52:14 -04:00
Michael Crosby
dcb4d72f98
Merge pull request #2614 from mirake/fix-typos-outputing 
Typo fix: outputing -> outputting
 2018-09-07 07:50:54 -04:00
Michael Crosby
eb6257bb69
Merge pull request #2617 from jianliao82/patch-1 
fix typo
 2018-09-07 07:50:16 -04:00
nashasha1
7f03ad6579 Fix typos 
Signed-off-by: nashasha1 <a4012017@sina.com>
 2018-09-07 16:59:42 +08:00
Xiaoxi He
9f817000cc Fix 'forward' typos 
Signed-off-by: Xiaoxi He <xxhe@alauda.io>
 2018-09-07 16:41:05 +08:00
liaoj
67849c4714 fix typo 
fix typo

Signed-off-by: jliao <jliao@alauda.io>
 2018-09-07 15:35:57 +08:00
ruicao
1f5ab28216 Typo fix: outputing -> outputting 
Signed-off-by: ruicao <ruicao@alauda.io>
 2018-09-07 12:47:18 +08:00
Justin Terry (VM)
ef910311e8 Add a Windows section for Linux oci on LCOW 
When creating a default OCI spec on Windows that is targeting the LCOW
platform it needs to contain a Windows section as well. This adds the
Windows section by default. It also protects against this case for all
OCI creation that doesnt use the OCI package in the runhcs-shim.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-09-06 11:05:45 -07:00
Michael Crosby
901b2ea2a7
Merge pull request #2595 from fuweid/bugfix_avoid_re_calculate_blob_state 
bugfix: avoid to re-calculate blob state for schema1
 2018-09-06 10:01:05 -04:00
Wei Fu
9db21deb5d bugfix: avoid to re-calculate blob state for schema1 
Use containerd.io/uncompressed label to avoid to re-calculate blob
diffID.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-09-06 09:14:56 +08:00
Lifubang
48fe63511a code optimization after review 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-09-05 23:36:31 +08:00
Phil Estes
96986c04db
Merge pull request #2609 from Callisto13/pr-fix-typos 
Fix teeny tiny typos
 2018-09-05 10:26:07 -04:00
Claudia Beresford
32e6aa742b Fix teeny tiny typos 
Signed-off-by: Claudia Beresford <cberesford@pivotal.io>
 2018-09-05 14:44:44 +01:00
Phil Estes
87a9d6e22a
Merge pull request #2607 from yanxuean/useless-para 
remove useless parameter from newTask
 2018-09-04 10:28:28 -05:00
yanxuean
517930187e remove useless parameter from newTask 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2018-09-04 10:59:00 +08:00