github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,307 Commits 3 Branches 2 Tags 112 MiB
99acefaad9
Commit Graph

337 Commits

Author SHA1 Message Date
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
Akihiro Suda
28e492fce0 allow non-mutual TLS 
Previously, client keypair had needed to be specified even when unused.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-08-10 21:48:03 +09:00
Lantao Liu
53e94c6753 Use containerd registry mirror library. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-09 14:39:30 -07:00
Michael Crosby
0dadef19cf Add docs for stream processors 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-09 18:40:43 +00:00
Michael Crosby
d085d9b464 Remove encryption code from containerd core 
We are separating out the encryption code and have designed a few new
interfaces and APIs for processing content streams.  This keep the core
clean of encryption code but enables not only encryption but support of
multiple content types ( custom media types ).

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-09 15:01:16 +00:00
Alex Price
3353ab76d9 Add flag to overload default privileged host device behaviour 
This commit adds a flag to the runtime config that allows overloading of the default
privileged behaviour. When the flag is enabled on a runtime, host devices won't
be appended to the runtime spec if the container is run as privileged.

By default the flag is false to maintain the current behaviour of privileged.

Fixes #1213

Signed-off-by: Alex Price <aprice@atlassian.com>
 2019-08-08 12:16:42 +10:00
Lantao Liu
871a8b89c8 Do not deprecate no_pivot yet. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-05 15:12:50 -07:00
Lantao Liu
b74653b821 Print warning message for deprecated options. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-02 01:10:11 -07:00
Derek McGowan
adad947b77
Merge pull request #3460 from lumjjb/ctrrecipients 
Specify protocols in ctr encrypt recipients
 2019-08-01 15:37:40 -07:00
Lantao Liu
467f9e0e8a Fix proc mount support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-31 17:11:15 -07:00
Akihiro Suda
4195136eea
Merge pull request #3433 from dmcgowan/gc-docs 
Add garbage collection doc
 2019-07-30 14:03:01 +09:00
Lantao Liu
c78caf902d Add max concurrent downloads support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-26 18:15:17 -07:00
Brandon Lum
8cd480c233 Specify protocols in ctr encrypt recipients 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-26 13:20:22 -04:00
Derek McGowan
22f44c44d9
Add garbage collection doc 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-07-25 14:42:30 -07:00
Aldo Culquicondor
4b43303203 Add option to register on TCP server 
Signed-off-by: Aldo Culquicondor <acondor@google.com>
 2019-07-25 09:42:49 -04:00
Lantao Liu
64bf4bebf3
Merge pull request #1188 from alculquicondor/fix/doc 
Update docs to v2 config
 2019-07-24 14:25:42 -07:00
Aldo Culquicondor
e2550f6285 Update docs to v2 config 
Signed-off-by: Aldo Culquicondor <acondor@google.com>
 2019-07-24 09:30:13 -04:00
Brandon Lum
c6d437fd70 Corrected lease implementation 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-18 18:17:20 -04:00
Stefan Berger
bf8804c743 Implemented image encryption/decryption libraries and ctr commands 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-17 15:19:58 -04:00
Joe Borg
9ebc10ec08 Correcting typo 
`/ec/` > `/etc/`

Signed-off-by: Joe Borg <joe@josephb.org>
 2019-07-04 14:12:20 -04:00
Michael Crosby
bb9616ba20
Merge pull request #3379 from Ace-Tang/clean-doc 
docs: remove shim_no_newns in ops.md
 2019-06-26 11:30:21 -04:00
Ace-Tang
2d03791158 docs: remove shim_no_newns in ops.md 
this ops is removed in commit fd2e3cd326,
remove from doc avoid misleading users.

Signed-off-by: Ace-Tang <aceapril@126.com>
 2019-06-26 16:37:36 +08:00
Phil Estes
0886e4f1b7
No need to keep 2017 DockerCon doc 
Remove outdated discussion document from repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-06-26 00:00:59 -04:00
BoWen Yan
d15a06b190 docs: Fix typo to some markdown files in /docs. 
Signed-off-by: BoWen Yan <loneybw@gmail.com>
 2019-06-13 15:29:12 +08:00
Mike Brown
3ba04c01cc doc update for cni max num 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-11 08:35:22 -05:00
kuramal
b022de5f37 add cni plugin config file max num config, set go-cni to commit 22460c0 
Signed-off-by: kuramal <linxxnil@126.com>
 2019-06-10 12:14:35 +08:00
Vlad Ungureanu
60a58af376 Add TLS auth registry support 
Signed-off-by: Vlad Ungureanu <ungureanuvladvictor@gmail.com>
 2019-06-06 14:55:53 -07:00
Lantao Liu
db90808477 Update doc and add deprecation policy for CRI options. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-25 16:11:16 -07:00
Lantao Liu
19e2b20c13 Use ctr images import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-15 10:37:31 -07:00
Derek McGowan
2f60e389a0
Merge pull request #2626 from krsoninikhil/defaults3 
Uses namespace labels for default options
 2019-04-02 11:46:35 -07:00
Lantao Liu
238658719f Cleanup pod annotation test and only support tailing wildcard. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-25 12:54:34 -07:00
Harshal Patil
effd82227c Add support for passing sandbox annotations to runtime 
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2019-03-21 14:38:14 +05:30
Mike Brown
9474b05dd7 clarify the versioning for the tarball 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-03-13 12:58:12 -05:00
Lantao Liu
f2f90f6b00
Merge pull request #1060 from Random-Liu/support-stream-idle-timeout 
Support stream idle timeout.
 2019-02-28 10:28:27 -08:00
Lantao Liu
8222da7768 Support stream idle timeout. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-28 01:30:01 -08:00
Lantao Liu
76ed153e8c Add more explanation about the CRI config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-27 16:51:36 -08:00
Aldo Culquicondor
c88e18b907 Fix architecture doc 
Network namespace is created before the pause container.

Signed-off-by: Aldo Culquicondor <acondor@google.com>
 2019-02-27 18:00:40 -05:00
Shengjing Zhu
fb80483711 docs: Add NAME section in all manpages 
As described in https://lintian.debian.org/tags/manpage-has-bad-whatis-entry.html
each manual page should start with a "NAME" section.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2019-02-22 23:40:28 +08:00
Mike Brown
857f169e9e update support statment reflecting eol for k8s 1.10 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-02-14 11:28:26 -06:00
Nikhil Soni
da2ab865e0 Add documentation for using namespace labels for configuring defaults. 
Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
 2019-02-01 23:14:33 +05:30
Derek McGowan
8706a355dd
Merge pull request #2889 from linxiulei/isolated_content 
metadata: define content sharing policy
 2019-01-14 13:15:38 -08:00
Phil Estes
a79879e9dd
Add security audit report to README 
Also remove weekly development reports section from README as those are
not being produced regularly at this time.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-01-04 09:56:03 -05:00
Akihiro Suda
cd8231ab2a support DisableCgroup, DisableApparmor, RestrictOOMScoreAdj 
Add following config for supporting "rootless" mode

* DisableCgroup: disable cgroup
* DisableApparmor: disable Apparmor
* RestrictOOMScoreAdj: restrict the lower bound of OOMScoreAdj

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2019-01-03 05:12:04 +09:00
Eric Lin
4247f2684d metadata: define content sharing policy 
This changeset modifies the metadata store to allow one to set a
"content sharing policy" that defines how blobs are shared between
namespaces in the content store.

The default mode "shared" will make blobs available in all namespaces
once it is pulled into any namespace.  The blob will be pulled into
the namespace if a writer is opened with the "Expected" digest that
is already present in the backend.

The alternative mode, "isolated" requires that clients prove they have
access to the content by providing all of the content to the ingest
before the blob is added to the namespace.

Both modes share backing data, while "shared" will reduce total
bandwidth across namespaces, at the cost of allowing access to any
blob just by knowing its digest.

Note: Most functional codes and changelog of this commit originate from
Stephen J Day <stephen.day@docker.com>, see
40455aade8

Fixes #1713 Fixes #2865

Signed-off-by: Eric Lin <linxiulei@gmail.com>
 2018-12-21 15:02:21 +08:00
Sebastiaan van Stijn
723797d320
docs: remove website leftovers 
The website content moved to the github.com/containerd/containerd.io
repository.

Commit da1fba0050 removed all website-
related content, but there were some stray files left behind.

This patch removes those files, and updates the `.editorconfig` file
to only match Markdown files.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-12-20 10:01:51 +01:00
Sebastiaan van Stijn
555ea3fb43
Ignore modprobe failures in ExecStartPre (systemd unit) 
When running containerd inside LXC, due to systemd being unable to execute
`modprobe overlay` inside the container (module is already loaded in host kernel).

This patch adds a `-` prefix to the `ExecStartPre` command, so that failures
are ignored, and the service can start as usual.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-11-10 12:52:06 +01:00
Akihiro Suda
ce6d4c9a9f add docs/rootless.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-11-06 17:39:30 +09:00
Lantao Liu
1442425f92 Support runtime specific configurations. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-08 17:17:29 -07:00
Lantao Liu
65283e4253 The indent is wrong. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-17 12:11:18 -07:00
Lantao Liu
3de8c8bf19 Update cri-tools to 98eea54af789ae13edce79cba101fb9ac8e7b241. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-17 10:54:42 -07:00
Tim Allclair
e7189a25c3
Add RuntimeHandler support 
Signed-off-by: Tim Allclair <tallclair@google.com>
 2018-09-05 17:27:35 -07:00
JulienBalestra
dffd0dfa0e
streaming: tls conf validation to func with tests 
Signed-off-by: JulienBalestra <julien.balestra@datadoghq.com>
 2018-08-30 15:10:48 +02:00
JulienBalestra
859003a940
stream: struct for x509 key pair, update the docs, error management 
Signed-off-by: JulienBalestra <julien.balestra@datadoghq.com>
 2018-08-28 17:22:11 +02:00
Phil Estes
da1fba0050
Website no longer managed from this repo 
Website content is deployed from containerd/containerd.io now

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-08-23 14:55:04 -04:00
Aleksa Sarai
7aa132ffc7
docs: man: rename config.toml(5) to be more descriptive 
The man page namespace is global, so in order to avoid colliding with
other man pages named "config.toml" rename ours to be more descriptive.
This also helps with discoverability (now tab-completion of 'man
containerd<tab>' will return the config man page), as well as making it
much cleaner from the perspective of distributions that want to package
containerd.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2018-08-08 18:33:29 +10:00
Michael Crosby
2742238909 Add docs for managed opts dir 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-03 11:50:02 -04:00
Lantao Liu
b3d6f16383 Serve streaming on localhost by default to match k8s 1.11 default. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-07-21 01:10:45 +00:00
yanxuean
7065dd81f9 support no_pivot option for runc 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2018-07-20 08:46:50 +08:00
Lantao Liu
0f3c83b11b Use --no-overwrite-dir in installation doc. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-07-11 18:04:48 +00:00
Lantao Liu
952e53bf58 Add registry auth config, and use docker resolver in containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-07-09 19:08:48 -07:00
Alban Crequy
6ef65b74e1 Document how to use systemd-run 
It is also useful when testing local changes, I just run:

sudo systemd-run -p Delegate=yes -p KillMode=process bin/containerd

Signed-off-by: Alban Crequy <alban@kinvolk.io>
 2018-06-27 16:58:30 +02:00
Lantao Liu
fd71c9f065 Fix another link. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-26 13:30:32 -07:00
Yu-Ju Hong
e23c0e708a
Fix link to GCE getting started guide 
Signed-off-by: Yu-Ju Hong <yjhong@google.com>
 2018-06-25 12:10:03 -07:00
Lantao Liu
405f57f8e0 Add max_container_log_size 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-14 14:24:17 -07:00
Luc Perkins
e5e63539a6 Return Markdown files to /docs directory 
Signed-off-by: Luc Perkins <lucperkins@gmail.com>
 2018-05-16 11:23:50 -07:00
Luc Perkins
d1503dc9ce Migrate website to Hugo 
Signed-off-by: Luc Perkins <lucperkins@gmail.com>
 2018-05-15 12:30:26 -07:00
Lantao Liu
e22ebf420f Down containerd binaries from official release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-24 01:23:44 -07:00
Lantao Liu
06f53b4838 Add unix:// prefix for socket addresses used by CRI remote client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-20 17:36:25 -07:00
Lantao Liu
9aa9f85a03 Add release instruction to make the release process written down. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-16 06:46:22 +00:00
Lantao Liu
d8a3c5f254 Address comments. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-09 18:15:09 +00:00
Lantao Liu
b2099c2061 Add cni config template support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-07 06:34:45 +00:00
Lantao Liu
ad7bffc093 Enable TLS streaming in all the setup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-03 00:17:26 +00:00
Lantao Liu
c4f80aecb7
Merge pull request #711 from tklauser/libapparmor-dep 
Drop libapparmor dependency from build docs
 2018-04-02 11:55:27 -07:00
Tobias Klauser
d29678a3c4 Drop libapparmor dependency from build docs 
As of opencontainers/runc@db093f6 runc no longer depends on libapparmor
thus libapparmor-dev no longer needs to be installed to build it or
anythind that depends on it (like containerd or cri-containerd). Adjust
the documentation accordingly.

containerd/containerd#2238 did the same for containerd.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2018-03-31 18:18:12 +02:00
Tyler Kellen
11189f6e8b fully specify --container-runtime-endpoint flag 
Resolves this warning:
"/run/containerd/containerd.sock" as endpoint is deprecated please
consider using full url format "unix:///run/containerd/containerd.sock"

Signed-off-by: Tyler Kellen <tyler@sleekcode.net>
 2018-03-28 17:23:43 -04:00
Lantao Liu
f0655ecfe0 Use pause image from new source. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-26 07:11:41 +00:00
Lantao Liu
356a41c424
Merge pull request #697 from Random-Liu/fs-layout-change 
adds volatile state directory to the fs plan for cntrs/pods/fifo
 2018-03-23 19:24:19 -07:00
Mike Brown
94df315de8 adds volatile state directory to the fs plan for cntrs/pods/fifo 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-24 00:05:52 +00:00
Lantao Liu
205892d935
Merge pull request #696 from Random-Liu/update-document 
Update documents.
 2018-03-23 14:47:33 -07:00
Lantao Liu
b05744478a Update documents. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-23 21:03:46 +00:00
Yanqiang Miao
559581e18a Add a document for cri plugin config 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2018-03-23 15:08:58 +08:00
Lantao Liu
65c1cc77bb
Merge pull request #682 from Random-Liu/update-doc 
Update README.d and graphs.
 2018-03-20 19:08:06 -07:00
Lantao Liu
129d060e10 Update README.d and graphs. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-20 21:11:23 +00:00
Lantao Liu
904938fa9d Fix for kube-up.sh and update several documments. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-20 09:24:15 +00:00
Lantao Liu
47855119ab
Merge pull request #667 from mikebrow/doc-updates-cri-move 
docs update for cri-containerd to cri move
 2018-03-16 16:24:40 -07:00
Mike Brown
0ee7614785 docs update for cri-containerd to cri move 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-16 15:33:17 -05:00
Lantao Liu
7e67d96b9b Replace ctrcri with ctr cri. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-15 23:22:00 +00:00
Yanqiang Miao
4a8060f08b Add document about registry configuration 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2018-03-08 11:02:57 +08:00
Mike Brown
ffea684c57 documents load image 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-05 15:57:44 -06:00
Kunal Kushwaha
b12c3215a0 Licence header added 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2018-02-19 10:32:26 +09:00
Michael Crosby
aa82d17d1d
Merge pull request #2079 from estesp/man-pages 
Add initial man pages
 2018-02-15 11:07:35 -05:00
Mike Brown
84139b4241 removes hack versions; splits update vendor and makes it optional 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-14 16:37:49 -06:00
Phil Estes
8f183b5ee9
Add basic manpages for ctr, containerd, containerd-config 
Adds initial manpages for ctr, containerd, and containerd config
commands, as well as the config.toml configuration file.

Adds targets to Makefile for generating and installing manpages.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-02-14 15:17:31 -05:00
Phil Estes
a929f9c746
Add further updates for website refresh 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-02-12 13:45:45 -05:00
Micheal Waltz
43b655b557
Link Docker release notes for containerd version 
Clarify which version of Docker use containerd versions and link to
release notes.

Signed-off-by: Micheal Waltz <ecliptik@gmail.com>
 2018-02-12 13:38:07 -05:00
Micheal Waltz
38ef0b6d3c
Updates to containerd.io index page 
- Fixes broken Dockercon link
- Attemps to clarify 1.0.0 release and support status

Signed-off-by: Micheal Waltz <ecliptik@gmail.com>
 2018-02-12 13:37:56 -05:00
Tom Godkin
19e9e1642a Fix typo in docs 
Signed-off-by: Tom Godkin <tgodkin@pivotal.io>
 2018-02-12 17:11:05 +00:00
Lantao Liu
532a895d7d Update critest. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 03:10:57 +00:00
Lantao Liu
605b4a7b6a Update imports 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 02:45:44 +00:00
Lantao Liu
047df7aca6
Merge pull request #602 from mikebrow/critools-install-minor-update 
update critools
 2018-02-07 18:44:37 -08:00
Mike Brown
edb2b2379d change crictl sandboxes to pods; other references to sandboxes 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-07 17:23:59 -06:00
Lantao Liu
caf2bdb04a Update ocicni to main stream. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-07 19:39:06 +00:00
Lantao Liu
1f1e03e001 Add a separate CLI for cri-containerd ctrcri. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-02 02:54:05 +00:00
Mike Brown
07c8f07ba3 fix kubernetes-incubator links 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-01-11 17:50:57 -06:00
Lantao Liu
025ffe551f Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-10 22:35:33 +00:00
Yu-Ju Hong
07a0685499 Fix typos and broken links in docs 
Signed-off-by: Yu-Ju Hong <yjhong@google.com>
 2018-01-05 10:44:13 -08:00
Chris Aniszczyk
b12e5794b1 Force ruby version for docs build 
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
 2018-01-04 10:49:50 -06:00
Chris Aniszczyk
fea2c381b1 Add build config for jekyll + netlify 
https://www.netlify.com/blog/2017/05/11/migrating-your-jekyll-site-to-netlify/

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
 2018-01-03 16:22:22 -06:00
Chris Aniszczyk
eeb5ea8cd4 Create CNAME 2018-01-03 14:40:48 -06:00
Chris Aniszczyk
00ad7fe408
Fix website rendering via gh-pages 
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-01-03 12:07:11 -08:00
Lantao Liu
5c37f6dc63 Fix kube-up document. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-22 01:09:07 +00:00
Lucas Molas
f61f60e01e Update getting-started guide with the new stdio implementation 
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
 2017-12-21 13:15:53 -03:00
Lantao Liu
ea6abcc1d7 Use sha256 instead of sha1. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-15 20:12:46 +00:00
Lantao Liu
372a9fb643
Merge pull request #500 from Random-Liu/add-kube-up-doc 
Add document for kube-up.sh
 2017-12-14 12:03:36 -08:00
Lantao Liu
7c8df861cc Add document for kube-up.sh 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-14 19:19:10 +00:00
Lantao Liu
944fdbf0b4 Add architecture graph for cri-containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-14 18:44:00 +00:00
Lantao Liu
fe5a21d977
Merge pull request #497 from mikebrow/doc-crictl 
add docs for using crictl
 2017-12-13 17:54:48 -08:00
Mike Brown
44d647cf96 add docs for using crictl 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-13 18:39:35 -06:00
Lantao Liu
ec975b2e7a Add OS and arch in release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-13 23:03:03 +00:00
YaoZengzeng
21c260398d add missing dependency in code example 
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
 2017-12-08 15:53:23 +08:00
Ace-Tang
aca8e15916 docs: fix usage of cio package in docs 
Signed-off-by: Ace-Tang <aceapril@126.com>
 2017-12-05 00:07:08 +08:00
Daniel Nephin
cdf62f69a1 Fix usage of oci in other packages. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-27 16:16:17 -05:00
bando-shintaro
5128f034b8 Fix docs, log output in getting started 
Signed-off-by: bando-shintaro <bando142141@gmail.com>
 2017-11-05 23:25:27 +09:00
Ian Campbell
680bab8468 Update docs with go 1.9 requirement. 
re: #1632

The comment about plugins in README.md didn't seem relevant any longer so I
removed it.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-10-12 15:06:36 +01:00
Michael Crosby
d7864eb77b Use namespace in default cgroup path 
By default, the generated spec will place containers in cgroups by their
ids, we need to use the namespace as the cgroup root to avoid
containers with the same name being placed in the same cgroup.

```
11:perf_event:/to/redis
10:freezer:/to/redis
9:memory:/to/redis
8:devices:/to/redis
7:net_cls,net_prio:/to/redis
6:pids:/to/redis
5:hugetlb:/to/redis
4:cpuset:/to/redis
3:blkio:/to/redis
2:cpu,cpuacct:/to/redis
1:name=systemd:/to/redis

11:perf_event:/te/redis
10:freezer:/te/redis
9:memory:/te/redis
8:devices:/te/redis
7:net_cls,net_prio:/te/redis
6:pids:/te/redis
5:hugetlb:/te/redis
4:cpuset:/te/redis
3:blkio:/te/redis
2:cpu,cpuacct:/te/redis
1:name=systemd:/te/redis
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-09 17:07:57 -04:00
Lantao Liu
1e00322107 Add guide for installation from release tarball 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 18:44:23 +00:00
Kenfe-Mickael Laventure
26d4c2c217
Add an option to prevent putting the shim in a new mount namespace 
This is needed for users on kernel older than 3.18 so they can avoid EBUSY
errors when trying to unlink, rename or remove a mountpoint that is present in
a shim namespace.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-04 09:16:02 -07:00
Nikhita Raghunath
bf2f942a11 Fix link to design proposal 
Signed-off-by: Nikhita Raghunath <nikitaraghunath@gmail.com>
 2017-10-03 12:21:53 +05:30
Lantao Liu
cfe365198b Update testing doc 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-24 03:27:10 +00:00
Phil Estes
fe1e00c06c
Fix example using old GenerateSpec function 
This fixes the example in the getting started guide. The full example
was already correct; tested compilation and proper runtime on latest
master.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-09-22 15:25:18 -04:00
Michael Crosby
f23edd3cc0 Add v1 to metrics API endpoint 
Fixes #1399

This versions the prometheus metrics API so we can manage backwards
incompatible changes in the future more easily.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-20 16:24:30 -04:00
Michael Crosby
9c207952b0 Add go build and ./main to guide 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-07 11:14:37 -04:00
Roy Inganta Ginting
34a58ce0d4 Improve the getting started guide 
Here is list of improvement:
- Add 2 intermediate full samples of code that can be compiled and ran
- Link to Runc.md page for runc installation
- Fix typo at the "Task Wait and Start" section
- Fix missing commands to run sample code at the getting stated guide
- Explicitly State go 1.8.x or above and link back to golang install page

Signed-off-by: Roy Inganta Ginting <ringanta.ginting@gmail.com>
 2017-09-07 11:12:37 -04:00
Michael Crosby
2052b76fa7 Change WithSpec to take SpecOpts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 14:32:41 -04:00
Michael Crosby
c601606f84 Move spec generation to Container Create 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Brian Goff
6ab99edb71 Convert ExitStatus to use fn to get details 
Instead of requiring callers to read the struct fields to check for an
error, provide the exit results via a function instead which is more
natural.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-08-22 10:48:44 -04:00
Brian Goff
026896ac4c Make Wait() async 
In all of the examples, its recommended to call `Wait()` before starting
a process/task.
Since `Wait()` is a blocking call, this means it must be called from a
goroutine like so:

```go
statusC := make(chan uint32)
go func() {
  status, err := task.Wait(ctx)
  if err != nil {
    // handle async err
  }

  statusC <- status
}()

task.Start(ctx)
<-statusC
```

This means there is a race here where there is no guarentee when the
goroutine is going to be scheduled, and even a bit more since this
requires an RPC call to be made.
In addition, this code is very messy and a common pattern for any caller
using Wait+Start.

Instead, this changes `Wait()` to use an async model having `Wait()`
return a channel instead of the code itself.
This ensures that when `Wait()` returns that the client has a handle on
the event stream (already made the RPC request) before returning and
reduces any sort of race to how the stream is handled by grpc since we
can't guarentee that we have a goroutine running and blocked on
`Recv()`.

Making `Wait()` async also cleans up the code in the caller drastically:

```go
statusC, err := task.Wait(ctx)
if err != nil {
  return err
}

task.Start(ctx)

status := <-statusC
if status.Err != nil {
  return err
}
```

No more spinning up goroutines and more natural error
handling for the caller.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-08-22 09:33:07 -04:00
Michael Crosby
b1eb1103a8 Add section for state dir 
Closes #1286

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-11 16:54:42 -04:00
Phil Estes
f90fa4e121
Minor updates to the namespaces doc 
Add info on labels. Some wording updates.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-08-10 11:08:03 -04:00
Michael Crosby
7a40eaabe8 Add namespace doc for containerd 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-10 10:22:23 -04:00
Michael Crosby
1907116bdd Add doc for extending client opts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-08 15:39:59 -04:00
Michael Crosby
a543d05708 Add ops guide for containerd 
This adds an explaination to some of the config file settings and what
the accomplish in containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-07 14:41:27 -04:00
Michael Crosby
d6c171ea89 Add getting started guide 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-07 09:17:27 -04:00
Lantao Liu
06a3949b87 Add cri-containerd test document for developer. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-29 01:08:56 +00:00
Patrick Chanezon
16f04383ae retrying pr for website to satify cncf guidelines 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>

fixing validation issue for whitespace

Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2017-06-16 14:30:31 -07:00
David Lyle
04f76c5505 fix relative image paths 
Signed-off-by: David Lyle <david.lyle@intel.com>
 2017-04-21 12:27:05 -06:00
Li Li
6ae973362a Update dockercon-summit.md 2017-04-20 01:31:00 -05:00
Ross Boucher
9999e85f80 Checkpoint/Restore proposal 2017-04-19 08:57:10 -05:00
Random-Liu
e51409a9cf Add initial documents. 2017-04-14 15:08:49 -07:00
Fabio Kung
f401bec0fd containerd summit: suggest a discussion about disk quotas 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
 2017-04-13 11:19:55 -07:00
Michael Crosby
4f2b443a27 Rewrite imports for new github org 
This rewrites the Go imports after switching to the new github org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-03 14:05:44 -07:00
Michael Crosby
c6f2193c28 Merge branch 'master' into patch-1 2017-04-03 11:42:50 -07:00
Random-Liu
803a60eaac Propose discussion of image filesystem metrics. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-03-31 17:08:08 -07:00
Liz Rice
f0d1c19a0f Propose discussion of Authorization plugin 
Signed-off-by: Liz Rice <liz@lizrice.com>
 2017-03-31 17:08:16 +01:00
Michael Crosby
58b0baf585 Add logo/assets 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-28 09:33:33 -07:00
Patrick Chanezon
06d5068055 removed unused images 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2017-03-17 12:09:03 -07:00
Patrick Chanezon
ecc0cc14c6 added website code for containerd.io 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2017-03-15 13:14:10 -07:00
Michael Crosby
1f15b058d2 Add link to signup form 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-10 11:40:27 -08:00
Michael Crosby
ee2d005984 Add dockercon summit discussion points 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-10 10:51:53 -08:00
Michael Crosby
e115b52ce2 Remove containerd files 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-11-07 13:10:09 -08:00
Harry Zhang
96ee432674 Refactoring minor fix 
Signed-off-by: Harry Zhang <harryz@hyper.sh>
 2016-06-30 23:13:04 -04:00
Ben Firshman
6228054b6f Move docs in readme to separate pages 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-06 14:14:51 -07:00
Qiang Huang
8dc52a6461 Update bundle.md 
As we only have config.json in specs now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-03-22 15:07:27 +08:00
Brian Goff
866ad6fe1d fix some docs typos and wording 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-12-17 16:02:58 -05:00
Michael Crosby
83eeb131d8 Update readme and documentation for release 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-12-16 12:15:22 -08:00
Michael Crosby
b3645c066d Add bundle documentation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-12-07 14:15:12 -08:00