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

11497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
936b7b0043
Merge pull request #4085 from thaJeztah/update_crypto 
vendor: bump golang.org/x/crypto bac4c82f6975
 2020-03-05 16:36:11 -08:00
Sebastiaan van Stijn
24cbca5a78
vendor: update containerd 0131015594 
full diff: e1221e69a8...0131015594

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 23:49:40 +01:00
Sebastiaan van Stijn
e0a8fe7cb6
vendor: bump golang.org/x/crypto bac4c82f6975 
This version contains a fix for CVE-2020-9283, but the code-path
is not in use in this repository.

Updating the dependency in case people are concerned that we
use a version of the dependency that doesn't have the fix.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 22:14:32 +01:00
Phil Estes
0131015594
Merge pull request #4084 from crosbymichael/kill-all-check 
[carry] Check error return from json.Unmarshal
 2020-03-05 16:04:54 -05:00
Mike Brown
d68533d654
Merge pull request #1412 from mikebrow/update-golang-1.13.8 
update to golang 1.13.8
 2020-03-05 14:44:40 -06:00
Mike Brown
d5ff8b5781
Merge pull request #1411 from thaJeztah/reformat_vendor 
Reformat vendor.conf: use columns, pin by git-sha, and sort alphabetically
 2020-03-05 14:21:44 -06:00
Maksym Pavlenko
233d61f51c
Merge pull request #4083 from crosbymichael/resource-opts 
Add linux resource oci.SpecOpts
 2020-03-05 12:20:22 -08:00
Mike Brown
ad984ca844 update to golang 1.13.8 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-03-05 13:31:15 -06:00
Ted Yu
a687d3a36d Check error return from json.Unmarshal 
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2020-03-05 13:38:08 -05:00
Sebastiaan van Stijn
3650918d9d
vendor.conf: reformat to use columns 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 19:32:07 +01:00
Sebastiaan van Stijn
1b74251d91
vendor.conf: sort imports alphabetically 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-05 19:28:26 +01:00
Michael Crosby
a3ca8a0dfc Add linux resource oci.SpecOpts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2020-03-05 13:02:10 -05:00
Maksym Pavlenko
54fd2cba49
Merge pull request #4081 from crosbymichael/info-spec 
Add ctr c info --spec flag to output spec
 2020-03-05 09:54:41 -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
Mike Brown
073e3c9bb4
Merge pull request #1403 from thaJeztah/align_selinux_to_tag 
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
 2020-03-03 13:04:02 -06:00
Maksym Pavlenko
3be12fe1c0 Do not loose snapshotter options 
Pass snapshotter options in recursive applyLayers calls.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-03-02 13:48:41 -08:00
Maksym Pavlenko
8cddb5f91d Pass snapshotter opts during Pull 
For remote snapshotter cases it's quite often there is need to pass extra info
from client (for instance - registry URL to query remote layer from, credentials, etc).

This commit slightly extends WithPullSnapshotter to pass extra labels to a snapshotter.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-03-02 13:45:40 -08:00
Sebastiaan van Stijn
bb59a061ef
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf 
full diff: c990c680b6...52ab431487

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-02 18:12:23 +01: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
Eric Ren
a3685262fe snapshots/devmapper: do not stop snapshot GC when one snapshot removing fails 
Snapshots GC takes use of pruneBranch() function to remove snapshots,
but GC will stop if snapshotter.Remove() returns error and the error
number is not ErrFailedPrecondition. This results in thousands of
dm snapshots not deleted if one snapshot is not deleted, due to
errors like "contains a filesystem in use".

So return ErrFailedPrecondition error number in Remove() function where
appropriate, and let GC process go on collecting other snapshots.

Fix: #3923
Signed-off-by: Eryu Guan <eguan@linux.alibaba.com>
Signed-off-by: Eric Ren <renzhen.rz@linux.alibaba.com>
 2020-02-29 13:32:48 +08:00
Eric Ren
b6bf7b97c2 devmapper: async remove device using Cleanup 
Fix: #3923
Signed-off-by: Eric Ren <renzhen@linux.alibaba.com>
 2020-02-29 13:32:48 +08:00
Phil Estes
3a1c6a260a
Merge pull request #4073 from dims/update-opencontainers/selinux-to-1.3.3 
Update to a released version of opencontainers/selinux (1.3.3)
 2020-02-28 17:45:44 -05: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
Mike Brown
6565c640be
Merge pull request #1407 from dims/update-opencontainers/selinux-to-1.3.3 
Update to a released version of opencontainers/selinux (1.3.3)
 2020-02-28 14:56:49 -06:00
Phil Estes
269015e31c
Merge pull request #4072 from thaJeztah/update_gotest_tools_v3 
vendor: update gotest.tools v3.0.2
 2020-02-28 13:00:41 -05:00
Mike Brown
d4d6b3a0fc
Merge pull request #1340 from lumjjb/enc-node-model 
Implement node key model for image encryption
 2020-02-28 10:49:36 -06:00
Sebastiaan van Stijn
f2edc6f164
vendor: update gotest.tools v3.0.2 
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-02-28 17:47:20 +01:00
Davanum Srinivas
3d4c597bdc
Update to a released version of opencontainers/selinux (1.3.3) 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-02-28 11:43:02 -05:00
Davanum Srinivas
026e43806a
Update to a released version of opencontainers/selinux (1.3.3) 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-02-28 11:34:40 -05:00
Brandon Lum
8d5a8355d0 Updated docs and code for default nil behavior 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-27 23:42:03 +00:00
Maksym Pavlenko
4d242818bf
Merge pull request #4053 from AkihiroSuda/vendor-grpc-20200225 
vendor protobuf & grpc (GoGoProtoPackageIsVersion3)
 2020-02-27 11:59:59 -08:00
Phil Estes
669f516b0e
Merge pull request #4062 from tedyu/start-shim-defer 
Use named error return for service#StartShim
 2020-02-27 13:23:31 -05:00
Ted Yu
f8ade8debd Use named error return for service#StartShim 
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
 2020-02-27 06:18:05 -08:00
Phil Estes
536d7ef92d
Merge pull request #4066 from thaJeztah/choco_progress 
AppVeyor: disable download progress on choco installs
 2020-02-27 08:38:42 -05:00
Sebastiaan van Stijn
985b26f2f9
AppVeyor: disable download progress on choco installs 
Downloading packages is quite noisy in the logs. This patch disables
the download progress output, which should save +/- 4000 lines of
output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-02-27 12:03:06 +01:00
Derek McGowan
06b284026d
Merge pull request #4063 from tedyu/namespace-path 
fix killall when use pidnamespace
 2020-02-26 23:08:31 -08:00
Ted Yu
4105135e36 fix killall when use pidnamespace 
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
 2020-02-26 20:56:49 -08:00
Phil Estes
ebec675a8d
Merge pull request #3802 from vladimiroff/unify-dialers 
Unify dialer implementations
 2020-02-26 16:54:22 -05:00
Kiril Vladimiroff
4dd75be2b9
Unify dialer implementations 
Instead of having several dialer implementations, leave only one in
`pkg/dialer` and call it from `pkg/ttrpcutil`, `runtime/v(1|2)/shim`
which had their own

Closes #3471.

Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
 2020-02-26 23:29:04 +02: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
Brandon Lum
808ae59cf6 Update vendors to versioning 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 22:08:31 +00:00
Phil Estes
9b4967bd6b
Merge pull request #4048 from fuweid/me-use-new-ctx-to-cleanup 
bugfix: cleanup dangling shim by brand new context
 2020-02-24 16:52:15 -05:00
Phil Estes
3b9f2e8540
Merge pull request #4051 from rancher/selinux 
Use spec's mountLabel when mounting the rootfs
 2020-02-24 16:51:21 -05:00
Brandon Lum
7a24da0375 Updated docs and encryption.md -> decryption.md 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
c5209cd679 Updated doc based on changes requested 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
ffcef9dc32 Addressed nits 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
8df431fc31 Defer multitenant key model to image auth discussion 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
c43a7588f6 Refactor encrypted opts and added unit test 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
ac8ec18813 bump imgcrypt commit version 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
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