Commit Graph

8706 Commits

Author SHA1 Message Date
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
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
Tim Allclair
e7189a25c3
Add RuntimeHandler support
Signed-off-by: Tim Allclair <tallclair@google.com>
2018-09-05 17:27:35 -07:00
Lantao Liu
67c0b3e5e2
Merge pull request #894 from Random-Liu/support-masked-readonly-paths
Support masked readonly paths
2018-09-05 10:32:40 -07:00
Lantao Liu
1e471b1a44
Merge pull request #895 from estesp/add-hostname-env
Add HOSTNAME to env by default for pod containers
2018-09-05 10:31:34 -07:00
Phil Estes
4c3e195db3
Add HOSTNAME to env by default for pod containers
To match expectations of users coming from Docker engine runtime, add
the HOSTNAME to the environment of new containers in a pod.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-09-05 12:04:40 -04: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
Lantao Liu
3e4cec8739 Add MaskedPaths and ReadonlyPaths support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-04 23:49:16 -07:00
Lantao Liu
4a65865eaa Update kubernetes to 6b7c39a4f8d4c38e8724550cc3e6e41b7ac7a276
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-04 23:47:39 -07:00
Lantao Liu
063f8158f8 Sort volume mount.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-04 22:43:37 -07:00
Tim Allclair
89b5b3cc40
Vendor latest CRI API
Signed-off-by: Tim Allclair <tallclair@google.com>
2018-09-04 20:05:11 -07: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
Lantao Liu
49877571e9
Merge pull request #886 from DataDog/JulienBalestra/tls-stream
stream: can use user certificates
2018-09-03 23:35:18 -07: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