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

3069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
992280e8e2 Merge pull request #1662 from mlaventure/update-cgroups 
Update containerd/cgroups to f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
 2017-10-19 11:05:05 -04:00
Kenfe-Mickael Laventure
7c9be56930
Update containerd/cgroups to f7dd103d3e4e696aa67152f6b4ddd1779a3455a9 
This fixes a leak of the oom_control eventfd to child processes.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-19 07:55:16 -07:00
Michael Crosby
1752bf590a Merge pull request #1660 from stevvooe/update-security-email 
README, RELEASES: update security email
 2017-10-19 09:57:07 -04:00
Stephen J Day
639d1bdd62
README, RELEASES: update security email 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-10-19 13:34:55 +02:00
Derek McGowan
f2ae8a020a Merge pull request #1658 from dmcgowan/gc-content-delete 
Update content store garbage collection
 2017-10-18 15:47:39 -07:00
Derek McGowan
923a5c873b
Update content store garbage collection 
Use single instance of content store instead of
creating new one for each collection. Using new
instance and wrapping causes failures.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-18 15:30:12 -07:00
Michael Crosby
87596ad708 Merge pull request #1657 from mlaventure/vendor-go-runc 
Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
 2017-10-18 16:36:38 -04:00
Kenfe-Mickael Laventure
90c535521a
Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7 
This fixes possible panics in Run & Restore when done without IOs

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-18 13:24:12 -07:00
Michael Crosby
84fa3967c5 Merge pull request #1656 from crosbymichael/rev-name 
Reverse checkpoint url
 2017-10-18 15:07:57 -04:00
Michael Crosby
21c992a9c8 Reverse checkpoint url 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-18 14:58:28 -04:00
Kenfe-Mickaël Laventure
5244d7b829 Merge pull request #1655 from dmcgowan/skip-user-ns-tests 
tests: skip user namespace tests in kernels which have it disabled
 2017-10-18 11:34:43 -07:00
Michael Crosby
cbeb0a847c Merge pull request #1652 from crosbymichael/cr-image 
create image for checkpoint
 2017-10-18 14:31:13 -04:00
Derek McGowan
efcec3674a
Skip user namespace tests in kernels which have it disabled 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-18 11:20:17 -07:00
Kenfe-Mickaël Laventure
ce57d6d619 Merge pull request #1634 from crosbymichael/release-build 
refactor release tool
 2017-10-18 07:35:42 -07:00
Michael Crosby
5a386446e3 Merge pull request #1653 from dmcgowan/fix-pull-race 
gc: fix pull race
 2017-10-18 10:10:32 -04:00
Phil Estes
ca63e6d10f Merge pull request #1645 from cpuguy83/limited_reader 
Use limited reader for some `ReadAll` cases.
 2017-10-18 11:56:14 +02:00
Derek McGowan
b798d87bd4
Ensure manifests are marked as root during pull 
For schema1 mark blobs as roots and remove labels
once referenced by the created manifest.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-17 16:26:52 -07:00
Michael Crosby
e4c6bf3b5e Remove default filter from ctr 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-17 17:10:03 -04:00
Michael Crosby
e833da1356 Clear root labels during checkpoint 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-17 16:53:44 -04:00
Michael Crosby
e201be5196 Create checkpointed image in client 
Allow a user provided name for the checkpoint as well as a default
generated name for the checkpoint image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-17 15:12:04 -04:00
Michael Crosby
a19fd6ed6e Add checkpoint media types to handler 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-17 11:26:28 -04:00
Jacob Wen
abbec62620 cmd/ctr: create an image for checkpoint 
This allows one to manage the checkpoints by using the `ctr image`
command.

The image is created with label "containerd.io/checkpoint". By
default, it is not included in the output of `ctr images ls`.
We can list the images by using the following command:
$ ctr images ls labels.containerd.\"io/checkpoint\"==true

Fixes #1026

Signed-off-by: Jacob Wen <jian.w.wen@oracle.com>
 2017-10-17 11:25:37 -04:00
Brian Goff
6eb56a2ec9 Use limited reader for some ReadAll cases. 
Prevents a server from sending a large response causing containerd to
allocate too much RAM and potentially OOM.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-10-17 09:06:16 -04:00
Stephen Day
70b5668351 Merge pull request #1631 from dmcgowan/cancel-unpack 
archive: update apply diff to support context cancellation
 2017-10-17 05:33:25 -07:00
Stephen Day
3c89aafdc3 Merge pull request #1649 from mlaventure/win-procdetaisl-use-stdtime 
windows: Use stdtime for hcsshimtypes.ProcessDetails.CreatedAt
 2017-10-17 05:23:12 -07:00
Michael Crosby
6b9edd089a Merge pull request #1640 from Random-Liu/fix-image-pull-race 
Reduce image pull race.
 2017-10-16 17:54:23 -04:00
Michael Crosby
2cdb3951a4 Merge pull request #1643 from cpuguy83/close_wait_chan 
Close wait chan after sending status
 2017-10-16 17:07:33 -04:00
Brian Goff
205625473f Close wait chan after sending status 
This allows the caller to receive multiple times without blocking after
the first call.

This can be useful in cases like this:
```go
  ch, _  := task.Wait(ctx)
  defer func() { <-ch } // don't return until task is done
  task.Start(ctx)

  if err := doSomething(task); err != nil {
    return err
  }

  status := <- ch
  // do stuff with status
```

Since this channel is created in the `Wait()` calls and never accessible
outside, this should be safe.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-10-16 16:55:43 -04:00
Kenfe-Mickael Laventure
e7ea7b5b50
windows: Use stdtime for hcsshimtypes.ProcessDetails.CreatedAt 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-16 13:40:17 -07:00
Phil Estes
ef5fe56c24 Merge pull request #1641 from WeiZhang555/fix-progress-bar 
[progress] Fix wrong display of progress bar
 2017-10-16 16:32:10 -04:00
Kenfe-Mickaël Laventure
79dad0ab02 Merge pull request #1650 from dmcgowan/fix-gc-race 
gc: fix race and test failures
 2017-10-16 12:57:14 -07:00
Derek McGowan
295cce278f
Use single instance of snapshot and content stores 
Ensures that all callers and the garbage collector are using
the same lock instances to prevent cleanup of objects
during creation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-16 11:57:50 -07:00
Derek McGowan
e378196505
Add snapshot label command to ctr 
Allows easier debugging of snapshots using labels

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-16 11:54:01 -07:00
Michael Crosby
d28b8cc80d Merge pull request #1648 from mlaventure/checkpoint-workdir 
linux: Pass correct path to runc when doing a checkpoint
 2017-10-16 13:58:47 -04:00
Kenfe-Mickaël Laventure
7562047f6a Merge pull request #1642 from mlaventure/arm-panic 
linux: Ensure count is 64bits aligned for proper atomic use on 32bits machines
 2017-10-16 10:56:02 -07:00
Kenfe-Mickael Laventure
71f0bb3e3c
linux: Pass correct path to runc when doing a checkpoint 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-16 10:45:03 -07:00
Kenfe-Mickael Laventure
d8e489443c
linux: Ensure count is 64bits aligned for proper atomic use on 32bits machines 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-16 10:15:01 -07:00
Zhang Wei
a06abd7493 [progress] Fix wrong display of progress bar 
When we try to pull an image with "ctr pull xxx", the progress bar
display will flush all the screen and make it so hard to find useful
information for user.

This commit fixes bugs for the progress bar, by correcting "line counting"
algorithm. Previous algorithm only counts number of "\n", but one line
can be longer than screen width, in which case it should be counted as
two lines. Also updated the screen cleaning ESC chars.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-10-17 00:24:54 +08:00
Kenfe-Mickaël Laventure
103dd0e75e Merge pull request #1644 from cpuguy83/unmarshal_error_desc 
Improve error message for `WithContainerExtension`
 2017-10-16 09:17:46 -07:00
Michael Crosby
c1a0775136 Build release tar and include hash 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-16 12:07:11 -04:00
Michael Crosby
7f4f4b5e68 Merge pull request #1646 from mlaventure/mlaventure-email 
Update @mlaventure e-mail address
 2017-10-16 11:21:01 -04:00
Phil Estes
3c7645a89d Merge pull request #1647 from yanxuean/typo 
a typo in comment of Snapshotter.Update
 2017-10-16 10:19:31 -04:00
yanxuean
d8d1209e50 a typo in comment of Snapshotter.Update 
containerd/snapshot/snapshotter.go

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-10-16 19:36:27 +08:00
Kenfe-Mickael Laventure
bdf801bd36
Update @mlaventure e-mail address 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-13 14:50:33 -07:00
Brian Goff
0847ae6cdf Improve error message for WithContainerExtension 
The previous error messages are not very descriptive in how to fix the
issue, especially since they come from container create and not when
calling `WithContainerExtensions`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-10-13 13:41:52 -04:00
Lantao Liu
09c2bfadd2 Reduce image pull race. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-13 05:17:43 +00:00
Derek McGowan
c66fd83eae Merge pull request #1636 from crosbymichael/cgroups 
Bump cgroups dep to 38a61430f7ceb01581fba6dd7ead48
 2017-10-12 15:52:46 -07:00
Michael Crosby
d805f77f50 Bump cgroups dep to 38a61430f7ceb01581fba6dd7ead48 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-12 14:24:16 -04:00
Phil Estes
91614a57dc Merge pull request #1633 from ijc/go1.9 
Update docs with go 1.9 requirement.
 2017-10-12 10:17:39 -04:00
Phil Estes
71c4ee5cf8 Merge pull request #1629 from dmcgowan/remove-archive-umask 
archive: remove umask, replace with explicit chmod after create
 2017-10-12 10:16:36 -04:00