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

5909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hu Shuai
52e477f947 Fix outdated comments 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2020-01-07 16:30:44 +08: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
a4b423b19b overlay: test actual Opts 
AsynchronousRemove opt was untested while it is specified by default in the plugin init.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-07 13:52:13 +09:00
Wei Fu
d5714702d1
Merge pull request #3883 from AkihiroSuda/ci-crun 
.travis.yml: run test with crun
 2020-01-07 12:46:32 +08:00
Akihiro Suda
067a66b90a
.travis.yml: run test with crun 
Relates to #3727

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-06 16:29:06 -08:00
Derek McGowan
b9fad5e310
Merge pull request #3765 from AkihiroSuda/mount-fuse 
mount: support FUSE helper
 2020-01-06 11:15:39 -08:00
Wei Fu
7c856d1980
Merge pull request #3929 from darfux/v2_fix_win_ctx_ns 
v2: Fix missing ns when openShimLog on windows
 2020-01-06 15:42:32 +08:00
Li Yuxuan
1fb1d93212 v2: Fix missing ns when openShimLog on windows 
Related to
https://github.com/containerd/containerd/pull/3921#discussion_r363046745

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2020-01-05 19:42:33 +08: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
Phil Estes
b95fa01b95
Merge pull request #3915 from yeahdongcn/push 
Support pushing a specific platform of a multi-architecture docker image to a registry
 2020-01-02 12:26:35 -05:00
Akihiro Suda
e739314ed4 mount: support FUSE helper 
When m.Type starts with either `fuse.` or `fuse3`, the
mount helper binary `mount.fuse` or `mount.fuse3` is executed.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-01 04:16:30 +09:00
Phil Estes
537afb1498
Merge pull request #3921 from darfux/v2_try_to_delete_shim_when_create_fail 
v2: Call shim.Delete at first when create is failed
 2019-12-31 00:02:27 -05:00
Michael Crosby
06b15f072d
Merge pull request #3920 from hs0210/work 
Fix a typo in task.go
 2019-12-30 10:49:04 -05:00
hs0210
87e2a95951 Fix a typo in task.go 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2019-12-30 13:40:33 +08:00
Derek McGowan
f823c37708
Merge pull request #3904 from yeahdongcn/manifest 
Replace ocispec.MediaTypeImageManifest with manifest.MediaType
 2019-12-27 22:03:13 -08:00
Li Yuxuan
d82fa43193 v2: Call shim.Delete at first when create is failed 
If the context is cancelled during `shim.Create()`, such as the client
disconnects unexpectedly. The created shim will never be deleted.
What's more, if the context is cancelled during `openShimLog()`, the
fifo will be closed and block the shim output.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2019-12-28 00:02:11 +08:00
Michael Crosby
6b94b646b7
Merge pull request #3911 from ktock/passinfo 
Enable to propagate necessary information to snapshotter during unpack
 2019-12-26 10:42:17 -05:00
ktock
493a36de95 Move label filter to snapshots package 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2019-12-25 12:13:08 +09:00
Wei Fu
c1a24be5ac
Merge pull request #3916 from thaJeztah/bump_golang_1.13.5 
Bump golang 1.13.5
 2019-12-24 21:20:32 +08:00
Sebastiaan van Stijn
06f6ea099a
switch nighly builds to Go 1.13.5 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-12-23 15:29:09 +01:00
Sebastiaan van Stijn
c07e356d29
Update Golang 1.13.5 
go1.13.5 (released 2019/12/04) includes fixes to the go command, the runtime, the
linker, and the net/http package. See the Go 1.13.5 milestone on our issue tracker
for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-12-23 15:27:18 +01: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
Kohei Tokunaga
4ccb7aa221 Enable to propagate necessary information to snapshotter during unpack 
Though containerd gives ChainID to backend snapshotters during unpack for
searching snapshots to be skipped downloading the contents, ChainID isn't enough
for some snapshotters which require additional information of layers.
Some examples are remote snapshotters which is based on stargz filesystem
(requires image-related information to query the contents to docker registry)
and those which is based on CernVM-FS (requires manifest digest, etc. for
providing squashed rootfs).

This commit solves this issue by enabling a handler to inject additional
information of layers to snapshotters during unpack.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2019-12-23 10:39:40 +09:00
Maksym Pavlenko
97712c8ad7
Merge pull request #3906 from estesp/update-console-vendor 
Update containerd/console vendor for fix
 2019-12-20 10:38:56 -08:00
Maksym Pavlenko
166cc8b7d5
Merge pull request #3905 from estesp/more-adopters 
Add more adopters to ADOPTERS.md
 2019-12-20 10:38:07 -08:00
Phil Estes
496836c092
Update containerd/console vendor for fix 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-12-20 11:33:11 -05:00
Phil Estes
a057bfbd71
Add more adopters to ADOPTERS.md 
Add k3s and Fargate.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-12-20 11:27:50 -05:00
Xiaodong Ye
facedf8980 Remove an empty line 
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
 2019-12-20 17:19:41 +08:00
Xiaodong Ye
05d192929b Update checkImages to accept images.MediaTypeDockerSchema2Manifest 
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
 2019-12-20 11:38:54 +08:00
Xiaodong Ye
c4ed3ff1ed Replace ocispec.MediaTypeImageManifest with manifest.MediaType 
Signed-off-by: Xiaodong Ye <xiaodongy@vmware.com>
 2019-12-20 10:26:13 +08:00
Michael Crosby
1809231003
Merge pull request #3896 from sipsma/close-platform-once 
runtime v2: Close platform in runc shim's Shutdown method.
 2019-12-19 11:54:26 -05:00
Michael Crosby
f602b7b883
Merge pull request #3899 from AkihiroSuda/fix-sys-mkdiras 
sys: mkdirAs: do chown if dir already exists
 2019-12-19 11:44:13 -05:00
Erik Sipsma
fbd46d7094
runtime v2: Close platform in runc shim's Shutdown method. 
Previously, the platform was closed as part of the Delete method when the
process was an init for a task and there were no more tasks after its deletion.
This can create problems if another task is created within the shim right after
the delete runs, which results in the platform being closed but the shim
continuing to run.

This change moves closing the platform to the Shutdown method after the shim's
context is canceled, which ensures the platform is only closed once the shim
is sure its done servicing containers.

Signed-off-by: Erik Sipsma <sipsma@amazon.com>
 2019-12-19 09:47:40 -05:00
Akihiro Suda
05bc0a1899
Merge pull request #3898 from estesp/test-5.0-kernel-ci 
Temporarily disable criu tests in Travis CI
 2019-12-19 21:45:26 +09:00
Phil Estes
8c7e6be290
Merge pull request #3870 from dmcgowan/download-during-apply 
Defer layer download until unpack
 2019-12-19 00:11:04 -05:00
Phil Estes
aac1ba0da4
Merge pull request #3893 from Zyqsempai/3736-added-cpu-and-memory-metrics 
Added memory and cpu metrics for cgroupv2
 2019-12-19 00:09:21 -05:00
Phil Estes
02dcf384bf
Disable criu tests in Travis CI 
Temporarily disable criu tests until the 5.0.0 CI kernel issue is
resolved. Also update criu to v3.13

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-12-19 00:06:12 -05:00
Akihiro Suda
62adc516dd sys: mkdirAs: do chown if dir already exists 
Fix `buildkitd --group GROUP` issue when `/run/buildkit` already exists
and is owned by the root.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-12-18 14:19:19 +09:00
Michael Crosby
9b5581cc9c
Merge pull request #3887 from joakimr-axis/joakimr-axis_scripts 
Improve install scripts
 2019-12-17 09:20:32 -05: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
b9d9bdf1fd make cpu metrics consistent with v2 docs 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 12:22:55 +02:00
Boris Popovschi
929ab521c6 fix system usage naming 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 11:05:28 +02:00
Boris Popovschi
659c971cad task metrics fix 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 10:52:37 +02:00
Boris Popovschi
23dbae3e71 Schema name fix 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-17 10:40:11 +02:00
Derek McGowan
566121485b
Merge pull request #3868 from awprice/issue-3850 
Improve host fallback behaviour in docker remote
 2019-12-16 21:43:10 -08:00
Boris Popovschi
17d61d6b7e Units fix 
Signed-off-by: Boris Popovschi <zyqsempai@mail.ru>
 2019-12-16 19:54:21 +02:00
bpopovschi
f287bc2292 Schema names fix 
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
 2019-12-16 19:28:42 +02:00
bpopovschi
6bfb24824b Fix prometheus metrics units 
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
 2019-12-16 18:27:50 +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