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

3698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
b41633746e
Merge pull request #2443 from thaJeztah/mask_acpi 
Add /proc/acpi and /proc/keys to masked paths
 2018-07-06 14:18:34 -04:00
Sebastiaan van Stijn
fe64b06a6d
Add /proc/keys to masked paths 
This leaks information about keyrings on the host. Keyrings are
not namespaced.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-06 18:46:45 +02:00
Sebastiaan van Stijn
8b42adeddc
Add /proc/acpi to masked paths 
relates to CVE-2018-10892

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-06 18:38:47 +02:00
Michael Crosby
e01779a0da
Merge pull request #2442 from thaJeztah/bump_containerd_console 
update containerd/console to fix race: lock Cond before Signal
 2018-07-06 11:58:22 -04:00
Sebastiaan van Stijn
77a26427c3
update containerd/console to fix race: lock Cond before Signal 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-06 17:26:22 +02:00
Kenfe-Mickaël Laventure
5900361791
Merge pull request #2420 from sudeeshjohn/master 
Fixing the formatting directives error during compilation
 2018-07-05 08:29:07 -07:00
sudeesh john
5a4f007e48 Fix the formatting directives error during compilation 
Signed-off-by: Sudeesh John <sudeesh@linux.vnet.ibm.com>
 2018-07-05 20:40:21 +05:30
Michael Crosby
0b0b41298a
Merge pull request #2437 from thaJeztah/remove_go_version_check 
Remove Go version check in travis
 2018-07-05 09:57:00 -04:00
Sebastiaan van Stijn
108c9cd4cf
Remove Go version check in travis 
containerd now only supports Go 1.10+, and travis is not
configured to run on older versions, so this check became
redundant.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-05 10:56:57 +02:00
Kenfe-Mickaël Laventure
39b6ba826a
Merge pull request #2431 from masters-of-cats/plugins-list-subcommand 
Introduce plugins/list subcommand
 2018-07-02 13:38:39 -07:00
Kenfe-Mickaël Laventure
4e64dcce85
Merge pull request #2432 from crosbymichael/ttrpc2 
Update ttrpc to 94dde388801693c54f88a6596f713b51a8
 2018-07-02 13:37:50 -07:00
Michael Crosby
6a83168157 Update ttrpc to 94dde388801693c54f88a6596f713b51a8 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-02 15:24:15 -04:00
Danail Branekov
3cf3881fa4 Introduce plugins/list subcommand 
`Ctr` interface follows the pattern `ctr <command> <subcommand>` except
for the `plugins` command which does not have subcommands. This feels
unnatural to certain users and they would expect that they can list
containerd plugins via `ctr plugins list`.

This commit implements their expectation so that `plugins` becomes a
command "group" and its `list` subcommand actually lists the plugins.

Signed-off-by: Danail Branekov <danailster@gmail.com>
 2018-07-02 10:20:20 +03:00
Phil Estes
a044b047e8
Merge pull request #2430 from Random-Liu/update-cri-to-v1.11.0 
Update cri to v1.11.0.
 2018-06-28 16:25:26 -04:00
Lantao Liu
f530a3c267 Update cri to v1.11.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-28 18:29:10 +00:00
Kenfe-Mickaël Laventure
e51ddf43e9
Merge pull request #2428 from crosbymichael/ttrpc 
Update ttrpc and typeurl packages
 2018-06-28 10:19:39 -07:00
Michael Crosby
8c709ac43a update typeurl 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-06-28 10:05:30 -04:00
Michael Crosby
08150bfe76 Update ttrpc for containerd repo 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-06-28 09:53:40 -04:00
Michael Crosby
ca204317ed
Merge pull request #2422 from crosbymichael/ctr-delete 
Add cio.Load for loading io set
 2018-06-27 08:46:18 -04:00
Kenfe-Mickaël Laventure
08f7ee9828
Merge pull request #2423 from crosbymichael/shim-procs 
Set shim max procs via env var
 2018-06-26 10:40:40 -07:00
Michael Crosby
fdceb13b14 Add cio.Load for loading io set 
This adds a `Load` Opt for cio to load a tasks io/fifos without
attaching or starting the copy routines.

It adds the load method in `ctr` by default so that fifos or other IO
are removed from disk on delete methods inbetween command runs.  It is
not the default for all task loads for backwards compat. and a user may
want to keep io around to reuse or if log files are used.

Fixes #2421

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-06-26 11:48:26 -04:00
Michael Crosby
68e144c637 Set shim max procs via env var 
This sets the shim's max procs to 2, like we already have hard coded in
the shim, with the env var so that it is set at go runtime boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-06-26 10:49:59 -04:00
Stephen Day
1ac546b3c4
Merge pull request #2411 from flx42/move-containerflags 
Move ContainerFlags to "commands" package
 2018-06-25 13:37:35 -07:00
Michael Crosby
f15c3be348
Merge pull request #2417 from dmcgowan/update-arm64-normalize 
Normalize arm64 to an empty variant
 2018-06-25 11:45:14 -04:00
Derek McGowan
db3c5afc6d
Normalize arm64 to an empty variant 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-06-23 16:35:46 -07:00
Derek McGowan
47a128d455
Merge pull request #2414 from dmcgowan/platform-arm-normalization 
Fix arm platform matching
 2018-06-22 13:15:23 -07:00
Phil Estes
995310cda9
Merge pull request #2408 from estesp/carry-2363 
Update architecture.md (Carry PR 2363)
 2018-06-22 11:49:23 -04:00
Derek McGowan
37ab93e2c8
Fix arm platform matching 
The normalization was being inconsistently applied causing a
failure to match some platforms in manifest lists.
Fix the matcher and normalization to be more consistent and
add changes to parser to prevent the defaulted variants from being
set in the platform structure.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-06-21 17:07:58 -07:00
Phil Estes
7ff2748f9c
Merge pull request #2410 from tonistiigi/mlist-error 
images: provide better error for manifest list match error
 2018-06-20 23:03:37 -04:00
Felix Abecassis
5dd22a20af Move ContainerFlags to "commands" package 
Commit 05513284e7 exposed the "rootfs"
and "no-pivot" flags for the "containers" command, but it accidentally
removed them for "run" since package-level variables are initialized
before package-level init functions in golang. Hoisting these flags to
a package imported by both commands solves the problem.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
 2018-06-20 18:33:59 -07:00
Tonis Tiigi
53fe31d6de images: provide better error for manifest list match error 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-20 13:43:27 -07:00
Andrew Osheroff
3c5b0dcf27
Update architecture.md 
Signed-off-by: Andrew Osheroff <andrewosh@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-06-19 18:13:14 -04:00
Phil Estes
c1e1f3d6d9
Merge pull request #2397 from harche/doc_fix 
Docs: Fix incomplete instructions for building using docker
 2018-06-13 17:37:41 -07:00
Harshal Patil
ef449aa38e Docs: Fix incomplete instructions for building using docker 
Fixes: #2396

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2018-06-13 13:38:57 +05:30
Kenfe-Mickaël Laventure
0158a6fb34
Merge pull request #2393 from vdemeester/gotestyourself-with-tools 
Update gotestyourself to gotest.tools
 2018-06-11 07:35:25 -07:00
Vincent Demeester
832b05ae67
Update tests to use gotest.tools angel 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 21:02:01 +02:00
Vincent Demeester
3830180ce5
Replace gotestyourself by gotest.tools 
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 21:00:45 +02:00
Michael Crosby
35887db096
Merge pull request #2370 from dmcgowan/update-maintainers-rules 
Update adding maintainer section
 2018-06-08 10:22:58 -04:00
Derek McGowan
7ba62b147d
Update adding maintainer section 
Updates the maintainers file to align with the process
we have been following for adding maintainers and reviewers.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-06-07 16:05:57 -07:00
Derek McGowan
63522d9eaa
Merge pull request #2390 from AkihiroSuda/fix-schema1 
fix schema1 fetchBlob()
 2018-06-07 09:34:15 -07:00
Michael Crosby
356b0d5964
Merge pull request #2388 from ehazlett/proc-interface 
Separate proc interfaces into standalone package
 2018-06-07 11:12:10 -04:00
Phil Estes
df34eefa12
Merge pull request #2330 from crosbymichael/hpc 
Add nvidia gpu support
 2018-06-07 10:10:20 -04:00
Evan Hazlett
a435f2886c separate proc interfaces into standalone package 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-06-07 10:03:15 -04:00
Akihiro Suda
703c25e452 fix schema1 fetchBlob() 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-06-07 17:51:41 +09:00
Derek McGowan
00d4910633
Merge pull request #2387 from ehazlett/runtime-shim 
Move runtime/linux/shim -> runtime/shim
 2018-06-06 13:38:52 -07:00
Evan Hazlett
821c8eaa91
runtime/linux/shim -> runtime/shim 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-06-06 14:35:06 -04:00
Michael Crosby
437e90aa5e
Merge pull request #2386 from northtyphoon/bindu/acr-push-location 
docker/pusher: handle location string containing path and query
 2018-06-05 18:54:29 -04:00
Bin Du
9b865d86a9 docker/pusher: handle location string containing path and query 
Signed-off-by: Bin Du <bindu@microsoft.com>
 2018-06-05 19:25:19 +00:00
Phil Estes
081b2d6330
Merge pull request #2384 from crosbymichael/bump-console 
Bump console for windows tty handling
 2018-06-05 18:32:00 +03:00
Michael Crosby
0cfca1e633 Bump console for windows tty handling 
ref: https://github.com/containerd/console/pull/25

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-06-05 10:14:41 -04:00