Commit Graph

8778 Commits

Author SHA1 Message Date
chentanjun
8788af7f8d modify-document-duplicate-word
Signed-off-by: chentanjun <2799194073@qq.com>
2019-09-05 09:10:19 +08:00
Derek McGowan
59a625defb
Merge pull request #3609 from Random-Liu/add-image-with-platform
Make default platform configurable in the client
2019-09-04 16:46:33 -07:00
Derek McGowan
d540b10c75
Merge pull request #3607 from awesomenix/updatecri
Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6
2019-09-04 13:42:29 -07:00
Michael Crosby
f76eefd272
Merge pull request #3574 from mxpv/cfg
Support config imports
2019-09-04 16:34:11 -04:00
Phil Estes
1eaf601453
Merge pull request #3616 from Random-Liu/fix-unpack-on-windows
Support foreign and encrypted layers in the unpacker.
2019-09-04 14:34:42 -04:00
Phil Estes
3050b36640
Merge pull request #3615 from dmcgowan/fix-proxy-plugin-config
Fix proxy plugin config validation
2019-09-04 10:09:24 -04:00
Lantao Liu
d6a6e0b8bc Support foreign and encrypted layers in the unpacker.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 18:43:10 -07:00
Derek McGowan
c7c7955757
Merge pull request #3614 from thaJeztah/travis_bionic_take2
travis: fix Xenial tests not being run on master
2019-09-03 17:42:40 -07:00
Derek McGowan
a4482d9a6f
Fix proxy plugin config validation
Proxy plugins are keyed only on the identifier, the type
is specified within the proxy plugin configuration which
maps to the full URI. The proxy plugin configuration is
not passed to the plugin for configuration like other
plugins.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-03 17:31:14 -07:00
Lantao Liu
6f59705a3f
Merge pull request #1256 from Random-Liu/exec-background
Clarify exec behavior in some edge cases
2019-09-03 17:22:00 -07:00
Derek McGowan
01f7265892
Support v1 configurations for config dump
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-03 17:20:44 -07:00
Lantao Liu
115b7664d9 Clarify some exec behavior.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:52:23 -07:00
Lantao Liu
857a2d0cc7
Merge pull request #1258 from Random-Liu/windows-support-1
Build CRI Plugin on Windows and Add Presubmit
2019-09-03 16:51:34 -07:00
Sebastiaan van Stijn
cd79e0edfe
travis: fix Xenial tests not being run on master
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-04 01:30:59 +02:00
Lantao Liu
0122e90b20 Add presubmit test for windows.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
86de625ece Update vendor
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
50c73e6dc5 Move unix specific logic into _unix.go
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
7b606375ae
Merge pull request #1259 from Random-Liu/fix-potential-panic-for-unknown-state
Fix panic for task in unknown state.
2019-09-03 16:20:15 -07:00
Mike Brown
2d17942b17
Merge pull request #1252 from Random-Liu/update-cri-tools
Update cri-tools to fix all image reference test failure.
2019-09-03 18:09:00 -05:00
Lantao Liu
c6203ec13b Fix panic for task in unknown state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 14:56:15 -07:00
Phil Estes
48fb479e22
Merge pull request #3606 from thaJeztah/bump_travis_bionic
travis: add Bionic (Ubuntu 18.04) to test matrix
2019-09-03 16:39:57 -04:00
Lantao Liu
555cb31fd9 Support configurable default platform in the client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 13:34:25 -07:00
Derek McGowan
b039c39186
Merge pull request #3564 from tiborvass/move-cgroups-dep-to-namespaces-pkg
runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package
2019-09-03 10:38:53 -07:00
Phil Estes
f7bd7e309c
Merge pull request #3611 from Random-Liu/fix-panic-for-unknown-task
Fix potential panic for task in unknown state.
2019-09-03 10:17:36 -04:00
Michael Crosby
24f7585ed8
Merge pull request #3610 from Random-Liu/fix-containerd-panic
Fix potential containerd panic during graceful shutdown.
2019-09-03 09:57:47 -04:00
Lantao Liu
c410f0eaef Fix potential panic for task in unknown state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-02 00:38:06 -07:00
Lantao Liu
dd24d76a13 Fix potential containerd panic during graceful shutdown.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-01 22:11:20 -07:00
Sebastiaan van Stijn
fa546dc3e8
travis: don't run old Xenial LTS on pull requests
The branch (for pull requests), is the base/target branch, so for pull
requests against master, these would still be run.

From the travis documentation:

> branch (the current branch name; for pull requests: the base branch name)

This patch excludes these jobs by not running them for pull request (event type=pull_request
or event type=push (when rebasing a pull request)).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-01 14:47:14 +02:00
Sebastiaan van Stijn
94e4b68798
travis.yml: add TRAVIS_DISTRO env-var for easier identification
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-01 14:32:17 +02:00
Sebastiaan van Stijn
214b8328d2
travis: add Bionic (Ubuntu 18.04 LTS) to test matrix
Using bionic (current LTS) as default, and add xenial (Ubuntu 16.04 LTS)
to the matrix, to test the previous LTS release as well on master

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-01 14:30:51 +02:00
Lantao Liu
b5ec5ee4f6
Merge pull request #1255 from Random-Liu/fix-doc
FDQN is a typo, and we don't support trailing dot in FQDN.
2019-08-30 14:58:22 -07:00
Lantao Liu
2d03ccf5dd FDQN is a typo, and we don't support trailing dot in FQDN.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-30 13:31:04 -07:00
Michael Crosby
95301fee3a
Merge pull request #3567 from renzhengeek/renzhen/devmapper
devmapper: activate dm device if snap device marked as activated
2019-08-30 14:47:45 -04:00
Nishchay Kumar
b6c811b7a4
Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6
Signed-off-by: Nishchay Kumar <mrawesomenix@gmail.com>
2019-08-30 11:32:52 -07:00
Maksym Pavlenko
db3a711738 Add 'containerd config dump' subcommand
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-30 10:55:32 -07:00
Mike Brown
f304b16a16
Merge pull request #1251 from Random-Liu/add-task-max
Add TaskMax=infinity in the systemd unit.
2019-08-29 17:19:53 -05:00
Lantao Liu
0997453f33 Update cri-tools to fix all image reference test failure.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-29 15:11:01 -07:00
Lantao Liu
567cd57f5f
Merge pull request #1250 from awesomenix/fixemptyauth
fix: support empty auth config for anonymous registry
2019-08-29 14:40:09 -07:00
Lantao Liu
523f3440b0 Add TaskMax=infinity
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-29 14:35:43 -07:00
Akihiro Suda
4a75a63f4a
Merge pull request #3600 from crosbymichael/sigprocmask
Add sigprocmask to default seccomp profile
2019-08-30 03:47:32 +09:00
Michael Crosby
779701b29c Add --seccomp flag to ctr
This enables testing of containers with the default seccomp profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-29 13:02:21 -04:00
Michael Crosby
5a3f3e329e
Merge pull request #3598 from AllenZMC/patch-1
fix mis-spelling in nvidia.go
2019-08-29 11:25:49 -04:00
Wei Fu
a4bbf8e4e6
Merge pull request #3599 from estesp/images-with-no-env
Use default UNIX env when image has no environment
2019-08-29 23:08:10 +08:00
Michael Crosby
86f8be86e1 Add sigprocmask to default profile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-29 11:07:03 -04:00
AllenZMC
f4927a2985 fix mis-spelling in nvidia.go
Signed-off-by: 常仲民@daocloud <zhongming.chang@daocloud.io>
2019-08-29 23:03:09 +08:00
Phil Estes
bc692cc59d
Use default UNIX env when image has no environment
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-08-29 10:16:24 -04:00
Phil Estes
36911af3cc
Merge pull request #3595 from AkihiroSuda/zfs-20190829
bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
2019-08-29 08:58:07 -04:00
Akihiro Suda
a292bf0f24 bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
31af176f2a...2ceb2dbb81

Fix containerd/zfs#22

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-08-29 14:28:54 +09:00
Michael Crosby
985bba61ff
Merge pull request #3589 from tonistiigi/truncate-time
archive: truncate modification time
2019-08-28 15:40:04 -04:00
Phil Estes
a1579eeb11
Merge pull request #3592 from crosbymichael/ttrpc-status
Update ttrpc to 92c8520ef9f86600c650dd540266a00
2019-08-28 14:24:54 -04:00