github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,015 Commits 3 Branches 2 Tags 112 MiB
45df696bf3
Commit Graph

9015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Georgi Sabev
2a5e4c4be7 Skip rootfs unmount when no mounts are provided 
Co-authored-by: Julia Nedialkova <julianedialkova@hotmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
 2019-04-04 18:20:09 +03:00
Michael Crosby
abfc89ce02 Update CRI to master 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-04 10:43:40 -04:00
Michael Crosby
4730088cb5 Update runc to resolve selinux issues 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-04 10:36:04 -04:00
Mike Brown
0e2afb63ac
Merge pull request #1113 from thaJeztah/bump_selinux 
bump opencontainers/selinux v1.2.1
 2019-04-04 07:51:08 -05:00
Sebastiaan van Stijn
5e7d59fc9d
bump opencontainers/selinux v1.2.1 
full diff: opencontainers/selinux@v1.2...v1.2.1

brings in opencontainers/selinux#49 Ignore attempts to setLabels "" on SELinux disabled systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-04 09:33:38 +02:00
Lantao Liu
63ad4c7305
Merge pull request #1114 from Random-Liu/fix-extra-handler 
Use local env to avoid writing to passed-in readonly env.
 2019-04-03 18:48:37 -07:00
Lantao Liu
fae4f79060 Enable runc.v2 as the default runtime in test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-03 18:47:25 -07:00
Lantao Liu
ebca0c4d4e Use local env to avoid writing to passed-in readonly env. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-03 16:54:43 -07:00
Sebastiaan van Stijn
2d11f5e6d5
Regenerate protobufs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 23:41:15 +02:00
Sebastiaan van Stijn
830b0294cc
Update protobuf v1.2.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 23:27:16 +02:00
Phil Estes
e16368d21f
Merge pull request #3171 from thaJeztah/bump_logrus 
bump sirupsen/logrus v1.4.1
 2019-04-03 17:20:02 -04:00
Michael Crosby
fdeb1084d3
Merge pull request #3170 from thaJeztah/unkeyed_fields 
do not use unkeyed fields in composite literals
 2019-04-03 16:59:14 -04:00
Sebastiaan van Stijn
7c1365b468
bump sirupsen/logrus v1.4.1 
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 22:23:53 +02:00
Sebastiaan van Stijn
01310eaebc
do not use unkeyed fields in compose literals 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-03 22:20:39 +02:00
Phil Estes
c9977b59f6
Merge pull request #3166 from mxpv/refactor 
Move snapshotters benchmark to a separate package
 2019-04-03 08:37:03 -04:00
Maksym Pavlenko
90085a7ac5 Add empty file to prevent build from failing 
Go build fails on directory with only test files
https://github.com/golang/go/issues/8279

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-02 17:35:19 -07:00
Stefan Berger
baf3403439 Extend Applier's Apply() method with an optional options parameter 
Extend the Applier interface's Apply method with an optional
options parameter.

For the container image encryption we intend to use the options
parameter to pass image decryption parameters ('dcparameters'),
which are primarily (privatte) keys, in form of a JSON document
under the map key '_dcparameters', and pass them to the Applier's
Apply() method. This helps us to access decryption keys and start
the pipeline with the layer decryption before the layer data are
unzipped and untarred.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2019-04-02 18:19:48 -04:00
Maksym Pavlenko
8784eb6308 Move snapshotters benchmark to a separate package 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-02 14:42:21 -07:00
Derek McGowan
2f60e389a0
Merge pull request #2626 from krsoninikhil/defaults3 
Uses namespace labels for default options
 2019-04-02 11:46:35 -07:00
Phil Estes
22bb5ebc7f
Merge pull request #3159 from thaJeztah/fix_parseinfofile_parsing 
Fix parseInfoFile does not handle spaces in filenames
 2019-04-02 09:40:26 -04:00
Sebastiaan van Stijn
adc4fa217b
Use pkg/errors for all errors 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-02 14:13:23 +02:00
Sebastiaan van Stijn
c22effb168
fix parseInfoFile does not handle spaces in filenames 
`/proc/self/mountinfo` uses `\040` for spaces, however, `parseInfoFile()`
did not decode those spaces in paths, therefore attempting to use `\040`
as a literal part of the path.

This patch un-quotes the `root` and `mount point` fields to fix
situations where paths contain spaces.

Note that the `mount source` field is not modified, given that
this field is documented (man `PROC(5)`) as:

    filesystem-specific information or "none"

Which I interpreted as "the format in this field is undefined".

Reported-by: Daniil Yaroslavtsev <daniilyar@users.noreply.github.com>
Reported-by: Nathan Ringo <remexre@gmail.com>
Based-on-patch-by: Diego Becciolini <itizir@users.noreply.github.com>
Based-on-patch-by: Sergei Utinski <sergei-utinski@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-02 13:06:32 +02:00
Derek McGowan
bc8a1895e3
Merge pull request #3155 from crosbymichael/plugins 
Add configurable plugin path
 2019-04-01 15:22:51 -07:00
Phil Estes
932f883e49
Merge pull request #3152 from mxpv/bench 
Add snapshotters benchmark
 2019-04-01 17:21:47 -04:00
Michael Crosby
559dfa59a1 Add configurable plugin path 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-01 16:54:27 -04:00
Michael Crosby
341b99d6e2
Merge pull request #3153 from thepwagner/issue-3118 
runtime/v1/linux/proc/io: io race
 2019-04-01 16:36:49 -04:00
Maksym Pavlenko
d9526f5c4f Move CloudFormation template to contrib 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-01 13:34:48 -07:00
Peter Wagner
ae04c16607 runtime: guard Close() until both streams are complete 
Signed-off-by: Peter Wagner <thepwagner@github.com>
 2019-04-01 15:23:57 -04:00
Peter Wagner
e96ac2040d runtime: log IO error when copying output streams 
Signed-off-by: Peter Wagner <thepwagner@github.com>
 2019-04-01 15:23:57 -04:00
Maksym Pavlenko
515be73c82 Add snapshotters benchmark 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-01 11:13:27 -07:00
Lantao Liu
b23b406fed
Merge pull request #1102 from Random-Liu/uts-namespace-and-fix-array 
Uts namespace and fix array
 2019-04-01 09:22:37 -07:00
Lifubang
872296642a fix shouldKillAllOnExit check for v2 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2019-03-30 11:37:14 +08:00
Lifubang
fa5f744a79 fix shouldKillAllOnExit check 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2019-03-30 11:36:56 +08:00
Lantao Liu
32dd6595cd
Merge pull request #1108 from Random-Liu/update-cni 
Update CNI to v0.7.5.
 2019-03-29 12:40:38 -07:00
Phil Estes
2d0a06d41b
Merge pull request #3146 from Ace-Tang/add-test 
test: add custom cgroup test
 2019-03-29 15:37:23 -04:00
Ace-Tang
f7f6dd7b4e test: add custom cgroup test 
avoid issue #3133 occurs again

Signed-off-by: Ace-Tang <aceapril@126.com>
 2019-03-29 15:55:50 +08:00
Lantao Liu
0caa06ac87 Update CNI to v0.7.5. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-29 00:13:35 -07:00
Lantao Liu
92fc1b9362
Merge pull request #1101 from thaJeztah/bump_selinux 
bump opencontainers/selinux to v1.2
 2019-03-28 23:33:23 -07:00
Michael Crosby
e7b6fea572
Merge pull request #3022 from mxpv/devmapper 
Integrate device mapper snapshotter
 2019-03-29 00:06:11 -04:00
Akihiro Suda
3a80a801af
Merge pull request #3139 from thaJeztah/bump_runc_v1.0.0-rc7 
update opencontainers/runc v1.0.0-rc7
 2019-03-29 12:32:50 +09:00
Michael Crosby
86cfcb870e
Merge pull request #3142 from thaJeztah/bump_cgroups 
bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
 2019-03-28 22:38:02 -04:00
Sebastiaan van Stijn
7b397f0322
bump opencontainers/selinux to v1.2 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-29 01:33:35 +01:00
Lantao Liu
84f9514df1
Merge pull request #1106 from Random-Liu/update-containerd 
Update containerd to f2a20ead83.
 2019-03-28 16:59:57 -07:00
Sebastiaan van Stijn
2b8df8309e
bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1 
full diff: dbea6f2bd4...4994991857

brings in https://github.com/containerd/cgroups/pull/79 Return ErrCgroupDeleted when no subsystems
fixes https://github.com/containerd/containerd/issues/3133 Custom cgroup path does not work in containerd 1.2.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-28 23:36:36 +01:00
Lantao Liu
c60dd60f80 Update containerd to f2a20ead83. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-28 14:31:13 -07:00
Sebastiaan van Stijn
bc6ac08784
update opencontainers/runc v1.0.0-rc7 
full diff: 2b18fe1d88...v1.0.0-rc7

changes included:

- opencontainers/runc#2012 Need to setup labeling of kernel keyrings
- opencontainers/runc#2014 Add $RUNC_USE_SYSTEMD to run tests using systemd cgroup driver
- opencontainers/runc#2015 Use getenv not secure_getenv
  - fixes opencontainers/runc#2013 build fails with musl libc
- opencontainers/runc#2023 Fixes regression causing zombie runc:[1:CHILD] processes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-28 21:42:17 +01:00
Lantao Liu
4b4182cf59 Do not assume there is no duplicated elements in arrays. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-28 13:05:55 -07:00
Michael Crosby
f2a20ead83
Merge pull request #3137 from Random-Liu/fix-race-and-panic 
Fix capability option race and panic.
 2019-03-28 11:43:28 -04:00
Lantao Liu
808b223536 Fix race and panic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-28 01:27:13 -07:00
Lantao Liu
9bd49c98c6 No UTS namespace for hostnetwork. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-27 15:07:36 -07:00