Commit Graph

5275 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
cd79e0edfe
travis: fix Xenial tests not being run on master
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-04 01:30:59 +02:00
Phil Estes
48fb479e22
Merge pull request #3606 from thaJeztah/bump_travis_bionic
travis: add Bionic (Ubuntu 18.04) to test matrix
2019-09-03 16:39:57 -04:00
Lantao Liu
555cb31fd9 Support configurable default platform in the client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 13:34:25 -07:00
Derek McGowan
b039c39186
Merge pull request #3564 from tiborvass/move-cgroups-dep-to-namespaces-pkg
runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package
2019-09-03 10:38:53 -07:00
Phil Estes
f7bd7e309c
Merge pull request #3611 from Random-Liu/fix-panic-for-unknown-task
Fix potential panic for task in unknown state.
2019-09-03 10:17:36 -04:00
Michael Crosby
24f7585ed8
Merge pull request #3610 from Random-Liu/fix-containerd-panic
Fix potential containerd panic during graceful shutdown.
2019-09-03 09:57:47 -04:00
Lantao Liu
c410f0eaef Fix potential panic for task in unknown state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-02 00:38:06 -07:00
Lantao Liu
dd24d76a13 Fix potential containerd panic during graceful shutdown.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-01 22:11:20 -07:00
Sebastiaan van Stijn
fa546dc3e8
travis: don't run old Xenial LTS on pull requests
The branch (for pull requests), is the base/target branch, so for pull
requests against master, these would still be run.

From the travis documentation:

> branch (the current branch name; for pull requests: the base branch name)

This patch excludes these jobs by not running them for pull request (event type=pull_request
or event type=push (when rebasing a pull request)).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-01 14:47:14 +02:00
Sebastiaan van Stijn
94e4b68798
travis.yml: add TRAVIS_DISTRO env-var for easier identification
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-01 14:32:17 +02:00
Sebastiaan van Stijn
214b8328d2
travis: add Bionic (Ubuntu 18.04 LTS) to test matrix
Using bionic (current LTS) as default, and add xenial (Ubuntu 16.04 LTS)
to the matrix, to test the previous LTS release as well on master

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-01 14:30:51 +02:00
Michael Crosby
95301fee3a
Merge pull request #3567 from renzhengeek/renzhen/devmapper
devmapper: activate dm device if snap device marked as activated
2019-08-30 14:47:45 -04:00
Nishchay Kumar
b6c811b7a4
Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6
Signed-off-by: Nishchay Kumar <mrawesomenix@gmail.com>
2019-08-30 11:32:52 -07:00
Maksym Pavlenko
db3a711738 Add 'containerd config dump' subcommand
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-30 10:55:32 -07:00
Akihiro Suda
4a75a63f4a
Merge pull request #3600 from crosbymichael/sigprocmask
Add sigprocmask to default seccomp profile
2019-08-30 03:47:32 +09:00
Michael Crosby
779701b29c Add --seccomp flag to ctr
This enables testing of containers with the default seccomp profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-29 13:02:21 -04:00
Michael Crosby
5a3f3e329e
Merge pull request #3598 from AllenZMC/patch-1
fix mis-spelling in nvidia.go
2019-08-29 11:25:49 -04:00
Wei Fu
a4bbf8e4e6
Merge pull request #3599 from estesp/images-with-no-env
Use default UNIX env when image has no environment
2019-08-29 23:08:10 +08:00
Michael Crosby
86f8be86e1 Add sigprocmask to default profile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-29 11:07:03 -04:00
AllenZMC
f4927a2985 fix mis-spelling in nvidia.go
Signed-off-by: 常仲民@daocloud <zhongming.chang@daocloud.io>
2019-08-29 23:03:09 +08:00
Phil Estes
bc692cc59d
Use default UNIX env when image has no environment
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-08-29 10:16:24 -04:00
Phil Estes
36911af3cc
Merge pull request #3595 from AkihiroSuda/zfs-20190829
bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
2019-08-29 08:58:07 -04:00
Akihiro Suda
a292bf0f24 bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
31af176f2a...2ceb2dbb81

Fix containerd/zfs#22

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-08-29 14:28:54 +09:00
Michael Crosby
985bba61ff
Merge pull request #3589 from tonistiigi/truncate-time
archive: truncate modification time
2019-08-28 15:40:04 -04:00
Phil Estes
a1579eeb11
Merge pull request #3592 from crosbymichael/ttrpc-status
Update ttrpc to 92c8520ef9f86600c650dd540266a00
2019-08-28 14:24:54 -04:00
Michael Crosby
97962976a4 Update ttrpc to 92c8520ef9f86600c650dd540266a00
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-28 14:00:13 -04:00
Michael Crosby
0293cbd26c
Merge pull request #3588 from katiewasnothere/exposeEventPublisher
Export shim publisher functions
2019-08-28 11:55:32 -04:00
Michael Crosby
d177ffd309
Merge pull request #3590 from tanjunchen/fix-grammar-mistake
fix-grammar-mistake
2019-08-28 10:39:20 -04:00
chentanjun
92a5b08a68 fix-grammar-mistake
Signed-off-by: chentanjun <2799194073@qq.com>
2019-08-28 16:10:08 +08:00
Tonis Tiigi
372472b5f6 archive: truncate modification time
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-27 17:42:32 -07:00
Kathryn Baldauf
2d8a65b1b2 Export shim publisher functions
- Our out of tree shim would like to publish events with ttrpc. These
functions should be exposed so our shim doesn't need to reimplement
publisher logic.

Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2019-08-27 17:15:15 -07:00
Tibor Vass
6624a70d92 runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package
The cgroup dependency brings in quite a lot only for WithNamespaceCgroupDeletion,
which is a namespaces.DeleteOpt.

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-08-27 19:02:55 +00:00
Michael Crosby
309617819b
Merge pull request #3582 from fuweid/me-cleanup-issue-CreateDiff
rootfs: use new ctx to cleanup instead of canceled one
2019-08-27 09:18:31 -04:00
Michael Crosby
cbfff2fb78
Merge pull request #3585 from tanjunchen/fix-up-spelling-mistake
fix-up spelling mistake
2019-08-27 08:51:33 -04:00
Wei Fu
32ceb628c2
Merge pull request #3581 from thaJeztah/bump_grpc
bump google.golang.org/grpc v1.23.0 (CVE-2019-9512, CVE-2019-9514, CVE-2019-9515)
2019-08-27 15:12:34 +08:00
chentanjun
8266a3c5e7 fix-up spelling mistake
Signed-off-by: chentanjun <2799194073@qq.com>
2019-08-27 13:45:41 +08:00
Wei Fu
09b184c15a rootfs: use new ctx to cleanup instead of canceled one
rootfs.CreateDiff might be canceled by context for some reason. Based on
this case, the defer function should use the new ctx to do cleanup
temporary snapshotter instead of the canceled one.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-08-27 11:27:34 +08:00
Sebastiaan van Stijn
2f54a7cb6b
bump containerd/ttrpc 9abb3e268010ea188f4e4051f77eb5aca49315fb
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 23:24:22 +02:00
Sebastiaan van Stijn
eb7a6bf02c
bump google.golang.org/grpc v1.23.0
full diff: https://github.com/grpc/grpc-go/compare/v1.20.1...v1.23.0

This update contains security fixes:

- transport: block reading frames when too many transport control frames are queued (grpc/grpc-go#2970)
  - Addresses CVE-2019-9512 (Ping Flood), CVE-2019-9514 (Reset Flood), and CVE-2019-9515 (Settings Flood).

Other changes can be found in the release notes:
https://github.com/grpc/grpc-go/releases/tag/v1.23.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 23:24:20 +02:00
Derek McGowan
d618c80077
Merge pull request #3584 from ehazlett/with-image-name
WithImageName container opt
2019-08-26 13:42:47 -07:00
Derek McGowan
cde03a0a2b
Merge pull request #3583 from Random-Liu/handle-duplicated-layer
Handle layers with the same digest in unpacker.
2019-08-26 13:08:19 -07:00
Michael Crosby
df84e546b5
Merge pull request #3577 from dmcgowan/change-default-manifest-download
[carry #3127] Update pull default to skip all platform manifests
2019-08-26 15:04:15 -04:00
Lantao Liu
56bcc77679 Handle layers with the same digest in unpacker.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-26 11:31:33 -07:00
Evan Hazlett
6f8fb9ee5d
add WithImageName container opt
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2019-08-26 14:29:17 -04:00
Derek McGowan
a40c3830df
Add option to pull all metadata
Add flags to pull and fetch to grab all metadata.
Add fetch option to pull only metadata.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-26 11:05:21 -07:00
Michael Crosby
dfd76b3484
Merge pull request #3579 from thaJeztah/bump_hashicorp_deps
Bump hashicorp deps
2019-08-26 11:44:46 -04:00
Phil Estes
3ad49a208b
Merge pull request #3578 from sofat1989/containerd-stress
update the max if cur will be greater than max for setting the limit
2019-08-26 05:57:40 -07:00
Sebastiaan van Stijn
55f737bd32
bump hashicorp/golang-lru v0.5.3
full diff: https://github.com/hashicorp/golang-lru/compare/v0.5.1...v0.5.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:40:08 +02:00
Sebastiaan van Stijn
ed1df65c25
bump hashicorp/go-multierror v1.0.0
full diff: ed905158d8...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:37:53 +02:00
Sebastiaan van Stijn
cbb3a3790e
bump hashicorp/errwrap v1.0.0
full diff: 7554cd9344...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:36:33 +02:00