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

10590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
c1fc21e92e ctr: use NewDockerAuthorizer instead of deprecated NewAuthorizer 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-09-09 02:38:07 +09:00
Lantao Liu
6961bfa1d4
Merge pull request #1266 from Random-Liu/support-local-containerd 
Support local containerd release.
 2019-09-06 17:47:19 -07:00
Lantao Liu
763461f47f Support local containerd release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-06 16:26:14 -07:00
Phil Estes
61b127f3e3
Merge pull request #3628 from crosbymichael/ctr-env 
Add --env-file to ctr
 2019-09-06 16:55:21 -04:00
Michael Crosby
fa11147e5f Add --env-file to ctr 
Closes #3517

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-06 16:25:02 -04:00
Phil Estes
2ddfc6d2ed
Merge pull request #3625 from dmcgowan/1.3-update-mailmap 
Update and simplify mailmap
 2019-09-06 07:21:07 -04:00
Derek McGowan
672b86acf8
Merge pull request #3624 from tklauser/platforms-update 
platforms: update known OS and arch values
 2019-09-05 16:53:37 -07:00
Derek McGowan
5c576b0269
Update and simplify mailmap 
Add new contributors for 1.3.
Simplify mailmap by removing unnecessary commit names.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-05 15:42:36 -07:00
Michael Crosby
eaa24d6e40
Merge pull request #3621 from tanjunchen/modify-document-repeat-word 
modify-document-duplicate-word
 2019-09-05 11:21:01 -04:00
Michael Crosby
77abec43c4
Merge pull request #3623 from fuweid/me-sort-before-check 
config_test: sort result before check
 2019-09-05 09:06:17 -04:00
Tobias Klauser
c8cb864ce0 platforms: update known OS and arch values 
Update the lists in isKnownOS and isKnownOS according to goosList and
goarchList taken from Go 1.13, see
https://github.com/golang/go/blob/release-branch.go1.13/src/go/build/syslist.go

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2019-09-05 14:15:43 +02:00
Wei Fu
3d1fdacccf config_test: sort result before check 
config imports is in random order after LoadConfig call so that the
testing check should be done after sort.Strings(out.Imports).

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-09-05 16:30:28 +08:00
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