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

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lantao Liu
a2655acd2a Update kubernetes to v1.12.0-beta.1. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-10 17:34:48 -07:00
Lantao Liu
fe0cd3672b
Merge pull request #865 from Random-Liu/cache-image-reference 
Cache image reference
 2018-09-10 16:21:57 -07:00
Lantao Liu
ed68cfd543
Merge pull request #901 from Random-Liu/fix-hostname-env 
Fix hostname env.
 2018-09-10 13:57:03 -07:00
Lantao Liu
953d67d250 Create image reference cache. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-10 11:30:52 -07:00
Lantao Liu
f08a90ff64 Fix hostname env. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-10 10:58:17 -07:00
Lantao Liu
cfdf872493
Merge pull request #891 from tallclair/runtimehandler 
Add RuntimeHandler support
 2018-09-10 10:09:57 -07: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
Yu-Ju Hong
9cd964f62b
Merge pull request #898 from Random-Liu/revert-#895 
Revert "Add HOSTNAME to env by default for pod containers"
 2018-09-06 16:20:29 -07:00
Lantao Liu
eb3d3cfc5e Revert "Add HOSTNAME to env by default for pod containers" 
This reverts commit 4c3e195db3.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-06 15:30:53 -07:00
Lantao Liu
db8500d10c
Merge pull request #892 from Random-Liu/fix-volume-mount-order 
Sort volume mount.
 2018-09-06 14:44:45 -07: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