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

3896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
17ab11a236 Fixes for runtimev2 and checkpoint restore 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-20 12:09:29 -04:00
Derek McGowan
94e132fd07
Add sync option on lease removal 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-19 14:37:55 -07:00
Michael Crosby
49fb363811
Merge pull request #2458 from fuweid/bugfix_apply_hardlink_to_softlink 
bugfix: allow hardlink to softlink file
 2018-07-19 14:38:20 -04:00
Derek McGowan
77ffa366af
Merge pull request #2476 from kolyshkin/osusergo 
BUILDING.md: add osusergo for static build
 2018-07-19 11:31:09 -07:00
Derek McGowan
2a8e28ae29
Merge pull request #2477 from crosbymichael/stress-runtime 
Set runtime for stress tests
 2018-07-19 11:26:04 -07:00
Michael Crosby
17ae673b5c Set runtime for stress tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-19 12:06:39 -04:00
Kir Kolyshkin
48570b39c5 BUILDING.md: add osusergo for static build 
Go 1.11 includes a fix to os/user to be working in a static binary
(fixing https://github.com/golang/go/issues/23265). The fix requires
`osusergo` build tag to be set for static binaries, which is what
this commit documents.

[v2: sort tags alphabetically]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-07-19 12:32:15 +03:00
Wei Fu
3b1534c47a bugfix: allow hardlink to softlink file 
With `fs.RootPath`, the target file will be the file which the softlink
points to, like:

  touch /tmp/zzz
  ln -s /tmp/zzz /tmp/xxx
  ln /tmp/xxx /tmp/yyy

The `/tmp/yyy` should be same with the `/tmp/xxx`, not `/tmp/zzz`. We
should allow hardlink to softlink file.

Signed-off-by: Wei Fu <fhfuwei@163.com>
 2018-07-19 15:13:50 +08:00
Michael Crosby
9743ff21c9 Don't fatal on epoll wait 
This removes a log fatal on epoll wait for OOM events.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-18 16:40:31 -04:00
Derek McGowan
94cfce62ba
Merge pull request #2434 from crosbymichael/shimv2 
Runtime v2 (shim API)
 2018-07-18 13:14:10 -07:00
Michael Crosby
d53a96fbe4 Add comments for oci protos 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-18 15:12:18 -04:00
Derek McGowan
29b72d4ff0
Support lease filters 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-18 10:43:37 -07:00
Derek McGowan
00a99c0472
Add leases subcommand in ctr 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-18 10:43:37 -07:00
Derek McGowan
4c2ad9cefb
Update CRI vendor 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-18 10:43:37 -07:00
Derek McGowan
8cf3fad8d4
Add leases manager interface 
Add leases manager to the leases package and use the
interface on the client and service.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-18 10:43:37 -07:00
Michael Crosby
026b7d922f Add README.md to runtime v2 
This readme specifies shim api and authoring docs.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-18 12:08:11 -04:00
Derek McGowan
c77c89b3d1
Add lease expiration to garbage collection 
Allow setting an expiration label to have the garbage
collector remove an item after the specified time.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-18 00:45:06 -07:00
Akihiro Suda
02579c8c3f
Merge pull request #2415 from dmcgowan/proxy-plugins 
Add support for proxy plugins
 2018-07-18 11:17:24 +09:00
Derek McGowan
3a916a0f67
Update client Image to have configurable platform 
Separate Fetch and Pull commands in client to distinguish
between platform specific and non-platform specific operations.
`ctr images pull` with all platforms will now unpack all platforms.
`ctr content fetch` now supports platform flags.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-17 15:43:03 -07:00
Michael Crosby
fd31052d9c Add oom events to shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-17 16:52:05 -04:00
Stephen Day
dfde5ec316
Merge pull request #2418 from crosbymichael/hook-root 
Handle abs path for rootfs in oci hook
 2018-07-17 12:17:28 -07:00
Stephen Day
9ca23811c3
Merge pull request #2424 from kinvolk/alban/systemd-run 
Document how to use systemd-run
 2018-07-17 11:52:55 -07:00
Michael Crosby
e17969caad
Merge pull request #2436 from thaJeztah/fix_gofmt 
Workaround for gofmt change in Go 1.11
 2018-07-17 14:52:29 -04:00
Michael Crosby
fb1084d9cc
Merge pull request #2464 from tonistiigi/oci-export-platform 
oci-exporter: do not filter current platform on export
 2018-07-17 10:28:22 -04:00
Michael Crosby
ed697290da
Merge pull request #2463 from crosbymichael/temp-clean 
Don't prevent boot on temp cleanup
 2018-07-17 10:27:21 -04:00
Michael Crosby
7e49c601a8 Add shim start for shim creation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-17 10:21:29 -04:00
Michael Crosby
da1b5470cd Runtime v2 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-17 10:21:29 -04:00
Michael Crosby
6de11ab973
Merge pull request #2470 from dmcgowan/fix-checkprotos 
Fix options ordering in proto api txt files
 2018-07-17 10:21:09 -04:00
Derek McGowan
d3cd5f1d01
Fix options ordering in proto api txt files 
An upstream change caused the options to now be ordered

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-16 16:32:38 -07:00
Tonis Tiigi
82e7204a3c oci-exporter: do not filter current platform on export 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-07-13 17:08:01 -07:00
Phil Estes
cef05f19a7
Merge pull request #2461 from dmcgowan/seed_rand 
Seed random on init
 2018-07-13 16:30:43 -04:00
Michael Crosby
0105959c3d Don't prevent boot on temp cleanup 
Fixes #2462
Fixes #2455

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-07-13 16:07:17 -04:00
Michael Crosby
8baeaff54b
Merge pull request #2460 from stevvooe/runc-build-instructions 
build: include instructions for runc build
 2018-07-13 09:52:23 -04:00
Derek McGowan
1c6929cbd4
Remove use of crypto rand in tests 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-12 17:51:55 -07:00
Derek McGowan
cce0a46c8a
Seed random on ctr and containerd startup 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-12 17:51:55 -07:00
Stephen Day
a5e0916aa9
build: include instructions for runc build 
Including some build information about runc that has been helpful in my
development environment. This should allow one to build and install runc
next to containerd so that both can be worked on simultaneously.

Signed-off-by: Stephen Day <stephen.day@getcruise.com>
 2018-07-12 15:55:52 -07:00
Derek McGowan
0c0c271b54
Update golang.org/x/sys 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-12 15:14:35 -07:00
Phil Estes
cb4bf2003f
Merge pull request #2454 from hairyhenderson/use-math-rand-instead-of-crypto-rand 
Switching from crypto/rand to math/rand to avoid blocking
 2018-07-12 11:40:16 -04:00
Dave Henderson
9a97ab34ce
Switching from crypto/rand to math/rand to avoid blocking 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2018-07-11 16:24:51 -04:00
Derek McGowan
b382b6fe0b
Merge pull request #2450 from Random-Liu/support-host-in-resolver 
Support specifying host in resolver.
 2018-07-10 18:29:49 -07:00
Lantao Liu
c8a8a49584 Support specifying host in resolver. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-07-09 18:26:02 -07:00
Kenfe-Mickaël Laventure
01d309e8f2
Merge pull request #2448 from rn/btrfs 
test: Increase btrfs loopback device size to 128MB
 2018-07-09 07:18:52 -07:00
Rolf Neugebauer
651920405e test: Increase btrfs loopback device size to 128MB 
With btrfs-prog 4.17 as shipped with Alpine 3.8 the btrfs tests
fail with:

  ERROR: '/dev/loop1' is too small to make a usable filesystem
  ERROR: minimum size for each btrfs device is 114294784

btrfs-prog commit 997f9977c243 ("btrfs-progs: mkfs: Prevent
temporary system chunk to use space in reserved 1M range")
changed the code to compute the minimum size for a btrfs size
and is the likely reason for this error.

Increase the size of the loop back device to 128MB for
the btrfs test.

With this fix, the containerd tests pass on Alpine 3.8,
tested in LinuxKit with kernel 4.14.53.

fixes #2447

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
 2018-07-08 10:53:03 +01:00
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