github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,742 Commits 3 Branches 4 Tags
fe0116ec2a55be60e2b74965a8628519f3920a6e
Commit Graph

761 Commits

Author SHA1 Message Date
Derek McGowan
392b2857aa Merge pull request #4848 from katiewasnothere/ctr_image_chainid 
Add a new flag to ctr "images pull" to print the image's chainID
 2021-01-21 17:11:53 -08:00
Maksim An
ddb5e1651a Enhance logging driver and ctr tasks to support windows 
Signed-off-by: Maksim An <maksiman@microsoft.com>
 2021-01-21 12:17:32 -08:00
Kathryn Baldauf
14df541a40 Add a new flag to images pull for printing out the pulled image's chainID 
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
 2021-01-12 15:42:40 -08:00
Akihiro Suda
e2e2c5737d export: add --skip-non-distributable 
The flag skips adding non-distributable blobs such as Windows layers to archive.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-01-01 06:32:01 +09:00
Akihiro Suda
419ad73727 ctr/commands/contents: expose ShowProgress 
Expected to be used by nerdctl

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-11 19:53:44 +09:00
Akihiro Suda
1febce4ca8 ctr: FetchConfig: allow setting additional []containerd.RemoteOpt 
The additional []containerd.RemoteOpt is not used by ctr currently,
but planned to be used by nerdctl and also probably by stargz's ctr-remote.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-09 16:12:13 +09:00
Derek McGowan
4a4bb851f5 Merge pull request from GHSA-36xw-fx78-c5r4 
Use path based unix socket for shims
 2020-11-30 10:32:18 -08:00
Michael Crosby
bd908acabd Use path based unix socket for shims 
This allows filesystem based ACLs for configuring access to the socket of a
shim.

Co-authored-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Michael Crosby <michael@thepasture.io>
Signed-off-by: Michael Crosby <michael.crosby@apple.com>
 2020-11-11 11:47:46 -08:00
Li Ning
97cee75da8 ctr: fix the incorrect image unmount error hint 
Signed-off-by: Li Ning <lining@cmss.chinamobile.com>
 2020-11-11 19:57:31 +08:00
Michael Crosby
5f74840a9a Merge pull request #4709 from AkihiroSuda/ctr-apparmor 
ctr: add AppArmor flags
 2020-11-10 10:21:51 -05:00
Akihiro Suda
9d54648be3 ctr: add AppArmor flags 
e.g.
```
$ sudo ./bin/ctr run --apparmor-default-profile "cri-containerd.apparmor.d" docker.io/library/alpine:latest foo cat /proc/self/attr/current
cri-containerd.apparmor.d (enforce)
```

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-11-10 14:19:35 +09:00
Evan Hazlett
ef48ef1e4c add config path option to ctr for runtime 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2020-10-29 15:21:37 +00:00
Avi Deitcher
57baf92211 use proper buffer size for content get 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
 2020-10-27 10:11:55 +02:00
Michael Crosby
21b6f68765 Add CNI support to ctr run 
This adds linux cni support to `ctr run` via a `--cni` flag.  This uses the
default configuration for CNI on `ctr` to configure the network namespace for a
container.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-10-14 22:37:53 -04:00
Phil Estes
534be84c5d Merge pull request #4529 from gongguan/creator 
avoid unnecessary NewCreator calls
 2020-09-21 13:33:51 -04:00
Guanjun Gong
0dea724fc0 NewTask avoid unnecessary cio.NewCreator calls 
Signed-off-by: Guanjun Gong <gongguanjun@hotmail.com>
 2020-09-21 11:45:37 +08:00
Li Yuxuan
bdb5b2ce47 ctr: Return error if task.Metrics fails 
Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2020-09-10 16:42:35 +08:00
Qian Xiao
469b637358 Fix ctr command typo. 
Signed-off-by: Qian Xiao <heyheyco@gmail.com>
 2020-09-07 15:50:52 -07:00
Brian Goff
899b4e3cb5 Ignore SIGURG signals in signal forwarder 
Starting with go1.14, the go runtime hijacks SIGURG but with no way to
not send to other signal handlers.

In practice, we get this signal frequently.
I found this while testing out go1.15 with ctr and multiple execs with
only `echo hello`. When the process exits quickly, if the previous
commit is not applied, you end up with an error message that it couldn't
forward SIGURG to the container (due to the process being gone).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-09-04 16:19:31 -07:00
Brian Goff
6650510836 Exit signal forward if process not found 
Previously the signal loop can end up racing with the process exiting.
Intead of logging and continuing the loop, exit early.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-09-04 16:17:00 -07:00
Shishir Mahajan
1eae524df6 ctr: CLI Flag (seccomp-profile) for setting custom seccomp profile. 
Signed-off-by: Shishir Mahajan <smahajan@roblox.com>
 2020-09-02 16:13:11 -07:00
Michael Crosby
db687ff485 Add --runtime-root to ctr 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-21 04:55:28 -04:00
Michael Crosby
7e84abe99c Merge pull request #4468 from prashantbhutani90/master 
Report correct stats for windows containers
 2020-08-25 11:37:28 -04:00
Prashant Bhutani
35b63c064f Report correct stats for windows containers 
Windows container stats were reporting incorrect metrics for cpu kernel runtime.

Signed-off-by: Prashant Bhutani <prbhutan@microsoft.com>
 2020-08-12 00:51:37 +05:30
kenneth.kang
e20a5079e8 Add --cpu-quota, --cpu-period flag to ctr 
Signed-off-by: Kenneth Kang <kenneth.kang@lge.com>
 2020-08-06 10:04:59 +09:00
Michael Crosby
02afa94256 Add --cpus flag to ctr 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-07-28 23:06:07 -04:00
Maksym Pavlenko
97c081c84b Merge pull request #4410 from TBBle/minor_windows_fixes 
Minor fixes around Windows network setup
 2020-07-21 15:26:18 -07:00
Paul "TBBle" Hampson
06fb93e0f0 Reject host-mode networking on Windows 
The flag was being silently ignored, and so no network setup was done,
and no notice given.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-07-21 19:43:08 +10:00
Sherif
96099550b5 parseIDMapping: accept 32-bit IDs 
Signed-off-by: Sherif Mowafy <sherif.mowafy@gmail.com>
 2020-07-19 10:09:51 +02:00
Phil Estes
45c28f56b2 Add ability to use remapper labels versus remapping snapshot helper 
A simple starting point for testing the remapper labels with
fuse-overlayfs snapshotter

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-06-29 10:21:55 -04:00
Wei Fu
4b5d7f66c9 Merge pull request #4290 from mxpv/ctr-oci 
Add ctr subcommand to print default OCI spec
 2020-05-29 10:45:36 +08:00
Maksym Pavlenko
636c533d95 Add ctr subcommand to print default OCI spec 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-28 14:06:44 -07:00
John Millikin
b8ccdcb07d Add ctr flags for configuring default TLS credentials. 
Signed-off-by: John Millikin <jmillikin@stripe.com>
 2020-05-27 21:59:33 +09:00
Brian Goff
1a10211e3f WithLease: always return context and done fn 
We should never return a nil context because of the way this function is
typically used... e.g.

```
  ctx, done, err := containerd.WithLease(ctx)
```

If there is an error `ctx` will be nil and any error handling may cause
an NPE if it tries to use `ctx`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-04-25 21:16:43 -07:00
Brian Goff
98b30f4690 Add commands to mount/unmount image from ref 
Example:

```terminal
$ mkdir /opt/busybox
$ ctr image mount docker.io/library/busybox:latest /opt/busybox
/opt/busybox
$ ls -lh /opt/busybox
total 40K
drwxr-xr-x 2 root   root     12K Apr 14 01:10 bin
drwxr-xr-x 2 root   root    4.0K Apr 14 01:10 dev
drwxr-xr-x 3 root   root    4.0K Apr 14 01:10 etc
drwxr-xr-x 2 nobody nogroup 4.0K Apr 14 01:10 home
drwx------ 2 root   root    4.0K Apr 14 01:10 root
drwxrwxrwt 2 root   root    4.0K Apr 14 01:10 tmp
drwxr-xr-x 3 root   root    4.0K Apr 14 01:10 usr
drwxr-xr-x 4 root   root    4.0K Apr 14 01:10 var
$ ctr image unmount /opt/busybox
$ ls -lh /opt/busybox
total 0
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-04-25 21:00:21 -07:00
Derek McGowan
547301cb0c Update ctr resolver to use new config package 
Moved registry host configuration to the config package
and allows support of loading configurations from a
directory when the hosts are being resolved.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2020-03-31 22:52:10 -07:00
Akihiro Suda
dc131aa862 support loading certs from a directory 
Add `remotes/certutil` functions for loading `ca.crt`, `client.cert`, and `client.key` into `tls.Config` from a directory like `/etc/docker/certs.d/<hostname>.

See https://docs.docker.com/engine/security/certificates/ .

Client applications including CRI plugin are expected to configure the resolver using these functions.

As an example, the `ctr` tool is extended to support `ctr images pull --certs-dir=/etc/docker/certs.d example.com/foo/bar:baz`.

Tested with Harbor 1.8.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-03-31 21:48:08 -07:00
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
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
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