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

8745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Brown
f673f0cf5c remove greetings due to security issue 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-21 17:00:45 -05:00
Wei Fu
6b669315bc
Merge pull request #1454 from mikebrow/project-dco-integration-for-make 
use project dco test locally
 2020-04-21 23:00:13 +08:00
Wei Fu
a45f57bcf1
Merge pull request #1375 from jdewinne/registry-doc 
Update registry.md for auth config
 2020-04-21 16:25:08 +08:00
Joris De Winne
050e8c63c0
Update registry.md for auth config 
Signed-off-by: Joris De Winne <joris.dewinne@gmail.com>
 2020-04-20 21:19:35 -07:00
Mike Brown
0049d4f973 use project dco test locally 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-20 14:57:07 -05:00
Phil Estes
1d083fec49
Merge pull request #4198 from fuweid/ignore-ttrpc-closed 
runtime: ignore ttrpc closed error
 2020-04-20 12:32:26 -04:00
Wei Fu
126e497e63 vendor: update ttrpc with 6e416eafd26e6e738df716b21d421d5b59702bb4 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-20 23:35:18 +08:00
Wei Fu
0116352e1b runtime: ignore ttrpc.ErrClosed when delete task 
For some reason, shimv2 process doesn't exist. The ttrpc doesn't detect
the connection closed by server until delete task. For this case, we
should ignore the ttrpc.ErrClosed and let task manager handle the
cleanup.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-20 23:34:49 +08:00
Mike Brown
9d37687a95
Merge pull request #1436 from chethanah/add-container-name-annot 
Support for additional OCI annotations: 'container-name'
 2020-04-19 13:19:47 -05:00
Wei Fu
f3e44466d6
Merge pull request #1451 from mikebrow/split-validate-from-build-and-test 
split tests and some refactoring
 2020-04-19 10:30:55 +08:00
Wei Fu
5bfab78acd
Merge pull request #4195 from mxpv/binary-io 
Binary IO fixes and tests
 2020-04-19 10:26:44 +08:00
Derek McGowan
4f6c594de3
Merge pull request #4194 from cpuguy83/remove_subreaper_config 
This config no longer exists, so remove from docs.
 2020-04-18 11:13:58 -07:00
Maksym Pavlenko
917e7646ae Add binary IO tests 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-04-17 16:50:43 -07:00
Maksym Pavlenko
9175401b28 Cleanup binary IO resources on error 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-04-17 15:56:21 -07:00
Maksym Pavlenko
0dc7c85956 Don't use timeout package when stopping shim logger 
containerd loads timeout values from config.toml and populated those
values to `timeout` package at launch. So when using `timeout` package
from shim, there are default values and config file is ignored.
So use a hardcoded value for binary IO.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-04-17 15:06:18 -07:00
Brian Goff
8574083153 This config no longer exists, so remove from docs. 
This was changed to `no_subreaper` in
6e9f24b711 and, as far as I can tell,
`no_subreaper` doesn't exist as a config anymore.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-04-17 14:14:35 -07:00
Mike Brown
b838ac8c2e split tests and some refactoring 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-17 15:32:37 -05:00
Mike Brown
c6c9268eb0
Merge pull request #1450 from yylt/add-scheme-endpoint 
add default scheme when mirrors no scheme
 2020-04-17 12:00:48 -05:00
yang yang
d07f7f167a add default scheme if endpoint no scheme 
Signed-off-by: yang yang <yang8518296@163.com>
 2020-04-17 23:33:28 +08:00
Akihiro Suda
d8506bfd7b
Merge pull request #4193 from ktock/bump_cri 
vendor: update containerd/cri 61b7af7564
 2020-04-17 16:36:18 +09:00
ktock
e79d666cdd vendor: update containerd/cri 61b7af7564 
full diff: 92cb4ed978..61b7af7564

This adds new dependency github.com/fsnotify/fsnotify since 4ce334aa49

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-17 12:31:30 +09:00
Mike Brown
61b7af7564
Merge pull request #1446 from mikebrow/remove-travis 
have moved these tests to github actions
 2020-04-16 18:56:49 -05:00
Mike Brown
27f911d663 removes the error when tls is configured for https but http is tried first 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-16 13:23:56 -05:00
Mike Brown
3fc5a909d1 have moved these tests to github actions 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-16 12:17:21 -05:00
Mike Brown
7ccd3f7d7e
Merge pull request #1431 from ktock/stargz 
Enable to pass additional handler on pull for stargz-based remote snapshots
 2020-04-16 12:02:02 -05:00
Derek McGowan
aa6a66b65e
Merge pull request #4192 from estesp/disable-travis-on-master 
Disable Travis CI on master
 2020-04-16 09:04:57 -07:00
Phil Estes
61597b4317
Disable Travis CI on master 
This allows Travis to continue running on PRs for release/1.x branches
where we have not enabled GH Actions.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-16 11:10:08 -04:00
ktock
c1b7bcf395 Enable to pass additional handler on pull for stargz-based remote snapshots 
Throughout container lifecycle, pulling image is one of the time-consuming
steps. Recently, containerd community started to tackle this issue with
stargz-based remote snapshots, as a non-core
subproject(https://github.com/containerd/stargz-snapshotter).

This snapshotter is implemented as a standard proxy plugin but it requires the
client to pass some additional information (image ref and layer digest) for each
pull operation to query layer contents on the registry. Stargz snapshotter
project provides an image handler to do this and stargz snapshot users need to
pass this handler to containerd client.

This commit enables to use stargz-based remote snapshots through CRI by passing
the handler to containerd client on pull operation.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-16 20:53:52 +09:00
Wei Fu
45f0e21d2c
Merge pull request #1445 from mikebrow/move-travis-to-github-actions 
adds git hub actions for linux CI
 2020-04-16 12:28:49 +08:00
Chethan Suresh
7fc8652e32 Add OCI annotations for container name 
Along with type(Sandbox or Container) and Sandbox name annotations
provide support for additional annotation:
  - Container name

This will help us perform per container operation by comparing it
with pass through annotations (eg. pod metadata annotations from K8s)

Signed-off-by: Chethan Suresh <Chethan.Suresh@sony.com>
 2020-04-16 07:14:58 +05:30
Mike Brown
67de3e4ccf adds git hub actions for linux CI 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-15 17:25:10 -05:00
Mike Brown
68a84f7878
Merge pull request #1438 from zhsj/use-containerd-reference 
Replace docker/distribution/reference with containerd/reference/docker
 2020-04-15 14:58:43 -05:00
Mike Brown
6e980b9efd
Merge pull request #1443 from dims/build-runc-with-selinux-support 
Build runc with selinux support
 2020-04-15 14:43:42 -05:00
Michael Crosby
327c92f7d7
Merge pull request #4189 from estesp/actions-fixes 
Small fixes to our Actions CI workflow
 2020-04-15 15:42:25 -04:00
Shengjing Zhu
4cee89baf5 Update vendor after dropping depends distribution/reference 
Signed-off-by: Shengjing Zhu <i@zhsj.me>
 2020-04-16 03:30:43 +08:00
Shengjing Zhu
4263229a7b Replace docker/distribution/reference with containerd/reference/docker 
Since https://github.com/containerd/containerd/pull/3728
The docker/distribution/reference package is copied into containerd core

Signed-off-by: Shengjing Zhu <i@zhsj.me>
 2020-04-16 03:29:58 +08:00
Phil Estes
74ceb35f50
Small fixes to our Actions CI workflow 
Integration tests were running with latest Go release rather than the
version used everywhere else. Also, we don't need to install protoc from
tarball and also apt-get the package for Ubuntu when used as a
dependency for criu build.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-15 15:19:01 -04:00
Davanum Srinivas
2b162b6c11
update selinux dependency to fix test failures 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-15 14:59:43 -04:00
Davanum Srinivas
e4ad53f2c2
Build runc with selinux support 
docker-ce seems to be building runc with selinux support, let us follow
the same pattern here please:
https://github.com/docker/docker-ce/search?p=1&q=RUNC_BUILDTAGS&unscoped_q=RUNC_BUILDTAGS

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-15 14:59:42 -04:00
Mike Brown
d531dc492a
Merge pull request #1405 from fuweid/me-async-load-cnicnf 
reload cni network config if has fs change events
 2020-04-15 13:57:32 -05:00
Mike Brown
3d250b8289
Merge pull request #1439 from mikebrow/fix-selinux-unit-test 
fixes bad unit test when selinux is enabled
 2020-04-15 13:54:19 -05:00
Mike Brown
8b6377bad8
Merge pull request #1442 from containerd/mikebrow-add-greeting-action 
Create greetings.yml
 2020-04-15 13:45:34 -05:00
Mike Brown
4a9fa22683
Merge pull request #1441 from dims/run-test-in-windows 
Running critest under windows using github action
 2020-04-15 13:45:10 -05:00
Davanum Srinivas
5c31c7591e
Running critest under windows using github actions 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-15 14:09:41 -04:00
Mike Brown
aa9b1885b5 fixes bad unit tests when selinux is enabled 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-15 12:28:11 -05:00
Mike Brown
7381f31b36 Create greetings.yml 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-15 11:59:24 -05:00
Michael Crosby
9441507fd2
Merge pull request #4183 from dims/build-runc-with-selinux-support 
Build runc with selinux support
 2020-04-14 20:40:25 -04:00
Davanum Srinivas
7a252f3ca1
Build runc with selinux support 
docker-ce seems to be building runc with selinux support, let us follow
the same pattern here please:
https://github.com/docker/docker-ce/search?p=1&q=RUNC_BUILDTAGS&unscoped_q=RUNC_BUILDTAGS

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-14 15:24:31 -04:00
Phil Estes
ccaf35b01c
Merge pull request #4188 from estesp/fix-proto-gen 
Fix protobuild and CI check protos
 2020-04-14 15:06:50 -04:00
Phil Estes
041545cd6a
Fix protobuild and CI check protos 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-14 14:31:43 -04:00