dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-06 13:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,231 Commits 31 Branches 333 Tags
bb5988d3d1da170491bbb83564976729d85c227e
Commit Graph
515 Commits
Author SHA1 Message Date
ktock c2081369c5 Add doc about remote snapshotter 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-07-23 13:05:05 +09:00
Michael Crosby 5f5d954b6a add selinux category range to config 
This allows an admin to set the upper bounds on the category range for selinux
labels.  This can be useful when handling allocation of PVs or other volume
types that need to be shared with selinux enabled on the hosts and volumes.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-07-20 16:02:07 -04:00
Brandon Lum f93b72530f Update doc cri plugin convention 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-07-22 17:34:17 +00:00
HsuanChi (Austin) Kuo 904ab30f9d Fix doc for runtime specifc options 
Signed-off-by: Hsuan-Chi Kuo <hckuo2@illinois.edu>
 2020-07-10 11:04:49 -05:00
Akihiro Suda fe6833a9a4 config: TolerateMissingHugePagesCgroupController -> TolerateMissingHugetlbController 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-02 13:49:42 +09:00
Avi Deitcher e7f069e2c3 describe content flow and dependencies 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
 2020-06-24 21:20:42 +03:00
Mike Brown b661ad711e Merge pull request #1504 from lorenz/ignore-image-defined-volumes 
Add option for ignoring volumes defined in images
 2020-06-14 11:52:48 -05:00
Wei Fu ae8200bf93 Merge pull request #1499 from webwurst/patch-1 
Fix typo
 2020-06-10 13:46:29 +08:00
Lorenz Brun 5a1d49b063 Add option for ignoring volumes defined in images 
Signed-off-by: Lorenz Brun <lorenz@brun.one>
 2020-06-09 21:02:47 +02:00
Brian Goff c694c63176 Add config for registry http headers 
This adds a configuration knob for adding request headers to all
registry requests. It is not namespaced to a registry.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-06-08 18:56:15 -07:00
Tobias Bradtke 098e040014 Fix typo 
Signed-off-by: Tobias Bradtke <webwurst@gmail.com>
 2020-06-05 18:19:49 +02:00
Michael Crosby 8898550e34 Merge pull request #1498 from mxpv/base 
Specify base OCI runtime spec
 2020-05-29 16:34:29 -04:00
Maksym Pavlenko df8d6c5b7b Update documentation for base OCI spec files 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-28 14:45:11 -07:00
Maksym Pavlenko 8d54f39753 Allow specify base OCI runtime spec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-28 13:39:31 -07:00
Mike Brown a7ad3bc01f add a registry auth tutorial 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-05-22 15:39:30 -05:00
Mike Brown 3f0aa45453 removing boilerplate test replace by projectboiler check 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-05-14 17:52:12 -05:00
Maksym Pavlenko 674fe72aa8 Update docs for unset seccomp profile 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-10 10:46:58 -07:00
Dave Syer 5ac8515bf0 Clarify that plugin names are long in version = 2 
Otherwise it's confusing for readers who just need quick reference
for plugin configurations.

Signed-off-by: Dave Syer <dsyer@pivotal.io>
 2020-04-27 14:35:41 +01:00
Martin Hickey 02307da36d Add improvement to docs 
Some small improvements to docs of things I found while
using the docs.

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
 2020-04-23 09:47:54 +00: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
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
Sebastiaan van Stijn ad090e67e9 man: move ctr.1, containerd-config to section 8, and fix generation 
I missed this in my previous change: the ctr man page is also
in Section 8, because it's considered an administrative tool,
and containerd-config is related to containerd so updating these
as well.

This commit also fixes naming of the generated files, which was
hard-coded to .1.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-03 12:32:52 +02:00
Sebastiaan van Stijn 356782cb47 Makefile: man page: rename containerd.1 to containerd.8 
The generated file was incorrectly named containerd.1 and should
be in section 8 (see [MAN-PAGES(7)]: Sections of the manual pages)

This patch fixes the filename and updates references to containerd(1)
to refer to containerd(8).

The generated file itself already had the correct section set in its
header, so didn't need updating.

[MAN-PAGES(7)]: http://man7.org/linux/man-pages/man7/man-pages.7.html

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-02 13:52:06 +02:00
Brandon Lum 8d5a8355d0 Updated docs and code for default nil behavior 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-27 23:42:03 +00:00
Brandon Lum 7a24da0375 Updated docs and encryption.md -> decryption.md 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum c5209cd679 Updated doc based on changes requested 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum 8df431fc31 Defer multitenant key model to image auth discussion 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum f0579c7b4d Implmented node key model for image encryption 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Mike Brown c9ed98462d move to v3.2 for the pause image 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-02-14 12:55:52 -06:00
Mihai Coman 5e6d56ee2d Fix startup_delay within default configuration 
Without this patch, the containerd daemon fails to start using the
default configuration example:
containerd[37139]: containerd: time: missing unit in duration 100000000

Signed-off-by: Mihai Coman <mihai.cmn@gmail.com>
 2020-01-29 15:34:23 +02:00
Yecheng Fu ef7f327f2a update config syntax in registry.md 
Signed-off-by: Yecheng Fu <fuyecheng@pingcap.com>
 2020-01-10 17:43:41 +08:00
Akihiro Suda b553bc14a2 update docs/rootless.md 
* Updated an example config to v2 syntax
* Updated for shim v2 (relates to #2767)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-08 13:37:29 +09:00
Akihiro Suda b127b666aa ctr: support $CONTAINERD_ADDRESS env var 
`$CONTAINERD_ADDRESS` can be specified instead of the `ctr --address` flag.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-07 15:59:12 +09:00
Akihiro Suda aaddaa2732 bump up the default runtime to "io.containerd.runc.v2" 
The former default runtime "io.containerd.runc.v1" won't support new features
like support for cgroup v2: containerd/containerd#3726

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-12-16 11:53:58 +09:00
Lantao Liu 4f350ad474 Fix typo. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-11-26 15:09:07 -08:00
Lantao Liu ab6701bd11 Add insecure_skip_verify option. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-11-26 13:25:52 -08:00
Ameya Gawde d21f0f116e windows process shim installer 
Signed-off-by: Ameya Gawde <ameya.gawde@docker.com>
 2019-10-30 16:22:02 -07:00
Lantao Liu aaccfcbe2b Fix containerd config dump. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-23 22:38:18 -07:00
Lantao Liu 56fa16ef9c Update the kube-up doc with a simpler approach. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 17:24:10 -07:00
Lantao Liu 35eb96d901 Update deployment and integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-18 17:21:37 -07:00
Michael Crosby f3a5b8c0a9 Add command to generate man pages 
The climan package has a command that can be registered with any urfav
cli app to generate man pages.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-11 15:31:02 -04:00
Ed Bartosh e28689657a Add ContatinerAnnotations to the Runtime and config 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2019-09-10 11:28:51 +03:00
Michael Crosby f76eefd272 Merge pull request #3574 from mxpv/cfg 
Support config imports
 2019-09-04 16:34:11 -04: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
chentanjun 92a5b08a68 fix-grammar-mistake 
Signed-off-by: chentanjun <2799194073@qq.com>
 2019-08-28 16:10:08 +08:00
Maksym Pavlenko 8ebffecbc3 Use map for stream processors 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-08-23 15:31:37 -07:00
Maksym Pavlenko ea6c749e35 Update config doc 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-08-23 11:08:25 -07:00
Lantao Liu 81ca274c6f Add wildcard mirror support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-13 12:02:57 -07:00
Phil Estes b77e25dade Merge pull request #3516 from crosbymichael/remote-enc 
Remove encryption code from containerd core
 2019-08-13 10:52:48 -04:00