github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
3,951 Commits 3 Branches 2 Tags 112 MiB
60d13d63c4
Commit Graph

3951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Akihiro Suda
acced5d58f
Merge pull request #2603 from crosbymichael/test-wait 
Wait before start with runtime root test
 2018-08-31 14:39:26 -07:00
Michael Crosby
a3d3055d75 Wait before start with runtime root test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-31 12:30:03 -04:00
Michael Crosby
d5aebde04c
Merge pull request #2580 from HusterWan/zr/fix-read-empty-timestamp 
bugfix: updatedAt timestamp file may be empty
 2018-08-31 11:44:28 -04:00
Phil Estes
a09bad557f
Merge pull request #2598 from Random-Liu/fix-state-error-handling 
Fix `runc state` error handling.
 2018-08-31 08:06:04 -07:00
Phil Estes
399dba5e63
Merge pull request #2599 from jterry75/windows_task_opt 
Merge WithResources for Linux/Windows TaskOpts
 2018-08-31 08:04:42 -07:00
Phil Estes
ccebed214c
Merge pull request #2601 from crosbymichael/unit 
Update unit file for resources and task max
 2018-08-31 08:02:57 -07:00
Michael Crosby
4972e3fae6 Update unit file for resources and task max 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-31 09:35:35 -04:00
Justin Terry (VM)
c48f8dec1f Merge WithResources for Linux/Windows TaskOpts 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-08-30 12:53:42 -07:00
Phil Estes
777cc50c72
Merge pull request #2592 from jterry75/specs_with_platform 
Merges the oci package for Linux and Windows
 2018-08-30 11:34:49 -07:00
Lantao Liu
7a4e0806c2 Fix runc state error handling. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-08-30 10:47:04 -07:00
Justin Terry (VM)
c818a6b13d Merges the oci package for Linux and Windows 
On Windows we need to be able to create both Linux and Windows OCI spec
files by default to support WCOW and LCOW scenarios. This merges the
compile time differences into runtime differences between the two based
on the spec and platform the user sets.

It maintains the old behavior with Default specs resulting in the
platform default the binary is compiled for.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-08-30 09:46:04 -07:00
Phil Estes
7e66292555
Merge pull request #2597 from masters-of-cats/kill-all-on-host-ns 
Do not KillAll on task delete by default
 2018-08-30 09:41:29 -07:00
Tom Godkin
b5ccc66c2c Do not kill all on task delete by default 
- Still KillAll if the task uses the hosts pid namespace
 - Test for both host pid namespace and normal cases

Co-authored-by: Oliver Stenbom <ostenbom@pivotal.io>
Co-authored-by: Georgi Sabev <georgethebeatle@gmail.com>
Signed-off-by: Oliver Stenbom <ostenbom@pivotal.io>
 2018-08-30 15:58:33 +01:00
Michael Crosby
0649e38c57
Merge pull request #2589 from crosbymichael/shim-robo 
Shim locking improvements and context cancel
 2018-08-30 10:18:53 -04:00
Michael Wan
92243ff72a bugfix: updatedAt timestamp file may be empty 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-08-29 21:49:40 -04:00
Michael Crosby
7cb847b870
Merge pull request #2593 from jterry75/add_win_build 
Add Windows build status
 2018-08-29 20:33:51 -04:00
Justin Terry (VM)
85eb2c3c83 Add Windows build status 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-08-29 15:43:07 -07:00
Michael Crosby
2205e8d67a Improve shim locking 
Only lock around shim state and not on actions

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-29 11:22:02 -04:00
Michael Crosby
d50e25360c Add context cancel for epoll 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-29 10:44:47 -04:00
Michael Crosby
d89ba5ee08
Merge pull request #2591 from dmcgowan/update-release-script 
Update release script
 2018-08-29 08:26:41 -04:00
Michael Wan
93d3f065ac vendor: update vendor containerd/aufs to commit ffa3997 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-08-29 07:30:31 -04:00