github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,445 Commits 3 Branches 4 Tags
25e4774ad85e35ace0dfb492034a16a003b6eb52
Commit Graph

1039 Commits

Author SHA1 Message Date
Peng Tao
ebd745f91a ctr: do not assume runc options by default 
If runtime is not runc, it doesn't make sense to send runc Options
as container create options, which will confuse other runtimes and
it actually causes kata shimv2 to fail to unmarshal the requset.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
 2020-03-24 18:45:34 +08:00
Sebastiaan van Stijn
4756258faf service_windows.go: remove unused "service" variable 
This was added in 40d898a820, but
doesn't appear to be used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-10 12:36:23 +01:00
Maksym Pavlenko
ddae905b82 Support NOTIFY_SOCKET 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-03-07 10:24:51 -08:00
Michael Crosby
00e6be9f45 Add ctr c info --spec flag to output spec 
This flag makes it easy to view only the OCI spec for the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2020-03-05 12:10:14 -05:00
Maksym Pavlenko
ca66f3dd5d Merge pull request #4076 from kevpar/windows-cri-support 
Enable CRI plugin for Windows builds as well
 2020-02-29 21:55:11 -08:00
Kevin Parsons
c7eec0c178 Fix file header in builtins_cri.go 
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2020-02-28 14:34:13 -08:00
Akihiro Suda
8e448bb279 vendor protobuf & grpc 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-02-26 10:57:05 +09:00
Justin Terry (SF)
fed8890e93 Enable CRI plugin for Windows builds as well 
The builtins_cri_linux.go file only being included for _linux builds which
means that the builds for Windows do not contain the CRI plugin. This can
be disabled for either platform with the no_cri tag.

Signed-off-by: Justin Terry (SF) <juterry@microsoft.com>
 2020-02-20 22:00:49 -08:00
Akihiro Suda
8e685f78cf support building with BUILDTAGS="no_zfs no_aufs" 
These plugins do not always need to be built-in.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-02-19 01:52:03 +09:00
Akihiro Suda
833701165a ctr events: do not exit on an error 
Errors like `"type with url %s: not found"` are typical for non-builtin
event types, and should not resultin exiting `ctr`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-29 13:10:16 +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
Wei Fu
5fc0f30167 Merge pull request #3903 from katiewasnothere/local_introspection 
create local version of introspection service
 2020-01-03 15:36:31 +08:00
Kathryn Baldauf
a18f77bea0 create local version of introspection service 
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
 2020-01-02 12:34:23 -08:00
Xiaodong Ye
072dfbaf36 Support pushing a specific platform of a multi-architecture docker image to a registry 
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
 2019-12-23 17:24:45 +08:00
Boris Popovschi
49e7039a85 cpu metrics consistency 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 12:30:12 +02:00
Boris Popovschi
659c971cad task metrics fix 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 10:52:37 +02:00
bpopovschi
b98cc79184 Added memory and cpu metrics for cgroupv2 
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
 2019-12-16 16:10:51 +02:00
Phil Estes
fa62b6d238 Use logrus instead of printf for warning 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-12-12 19:33:04 -05:00
Michael Crosby
5d93ece758 Merge pull request #3799 from AkihiroSuda/cgroup2 
support cgroup2
 2019-12-12 14:30:19 -05:00
Michael Crosby
1649e8e43b Merge pull request #3848 from liaojh1998/master 
support user remapping in ctr
 2019-12-12 14:20:07 -05:00
Joakim Roubert
e0011978ff start.go: Improve help text 
Change-Id: I9adfc27868b246fb85823d18c65f95668e3fbc58
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2019-12-12 11:19:41 +01:00
Jie Hao Liao
9862cb8f85 support user remapping in ctr 
* --uidmap support for one remapping
* --gidmap support for one remapping
* create IoUid and IoGid options for getNewTaskOpts

Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
 2019-12-12 01:16:47 -06:00
Akihiro Suda
8f870c233f support cgroup2 
* only shim v2 runc v2 ("io.containerd.runc.v2") is supported
* only PID metrics is implemented. Others should be implemented in separate PRs.
* lots of code duplication in v1 metrics and v2 metrics. Dedupe should be separate PR.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-12-12 02:56:51 +09:00
Jie Hao Liao
787be0efe2 Modify ctr run to search for read-only flag instead of readonly 
Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
 2019-12-04 02:18:23 -06:00
Phil Estes
11ef041ff4 Update golang.org/x/sys to recent commit 
This prepares us to be able to update docker/docker vendoring to a
recent commit.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-11-22 19:34:38 -05:00
Lantao Liu
0bb48aef07 Add --log-file flag for windows service. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-11-15 16:57:39 -08:00
Akihiro Suda
8f74de9e9e ctr: allow specifying --runc-systemd-cgroup 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-11-08 14:06:08 +09:00
Akihiro Suda
7f5d900769 ctr: allow specifying --runc-binary 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-11-08 14:06:08 +09:00
Akihiro Suda
a2688b972c bring back aufs and zfs 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-10-30 17:51:27 +09:00
Phil Estes
aeec80fca1 Merge pull request #3773 from Random-Liu/use-logrus-trace 
Use logrus trace support.
 2019-10-25 07:45:31 -04:00
Lantao Liu
20e844a227 Use logrus trace support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-24 20:12:19 -07:00
Derek McGowan
66aa1d3ef6 Add snapshot walk implementations 
Temporarily remove zfs and aufs until interface update

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-10-24 11:11:22 -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
Justin Terry (VM)
37b56cafc6 Add ctr metrics support for Windows/LCOW containers 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-10-23 13:50:34 -07:00
Michael Crosby
38937f0607 Merge pull request #3718 from crosbymichael/devperms 
Add spec opts for host device and privileged handling
 2019-10-11 09:56:14 -04:00
Michael Crosby
a6d3f4d30b Add device opts to ctr --privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-10 14:23:59 -04:00
Eli Uriegas
036db34f37 build: Fix manpage generation 
Seems to be that docs/man/ctr.1.md and docs/man/containerd.1.md were
removed in #3637 and were not updated correctly in the Makefile, leading
to build failures like:

    + make man

    make: *** No rule to make target `man/ctr.1', needed by `man'.  Stop.

Changes the gen-manpages command to be specific on which manpages are to
be generated.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-10-08 18:22:23 +00:00
fahed dorgaa
c0984941e3 adding go version to client description 
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

gofmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add a Godoc

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

go fmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add sapces to comment

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
 2019-10-06 13:38:51 +02:00
Phil Estes
309c9c25ba Merge pull request #3706 from mrueg/enable-autocmpl 
ctr: Enable shell autocompletion
 2019-10-03 09:15:51 -04:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages 
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-01 10:19:56 -04:00
Manuel Rüger
b5fa55b0c2 ctr: Enable shell autocompletion 
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
 2019-10-01 09:43:21 +02:00
yuxiaobo
a0ae24b984 Word spelling correction 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
 2019-09-25 16:49:54 +08:00
Eli Uriegas
2a636f8c34 gen-manpages: Create man directory if it does not exist 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-09-23 20:31:26 +00:00
Michael Crosby
fd6299be98 Fix density spec generation 
Fixes #3580

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-17 16:21:25 -04:00
Lajos Papp
19ecd49ed0 implement ctr -connect-timeout 
Signed-off-by: Lajos Papp <lalyos@yahoo.com>
 2019-09-16 13:56:53 +02:00
Michael Crosby
5a656cacb4 Move manpage gen to separate binary 
This moves the man page generation to a separate binary

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-12 14:19:00 -04: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
Michael Crosby
51671ef734 Merge pull request #3630 from AkihiroSuda/ctr-newdockerauthorized 
ctr: use NewDockerAuthorizer instead of deprecated NewAuthorizer
 2019-09-09 12:47:10 -04:00
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
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