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

4116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
c20c569a01
Merge pull request #2742 from fuweid/bugfix_return_context_cancel_error_during_subcribe 
bugfix: return the context error during event subscribe
 2018-10-24 16:13:41 -07:00
Wei Fu
15a761c035 bugfix: return the context error during event subscribe 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-10-24 19:25:57 +08:00
Phil Estes
9fb7eedb5b
Merge pull request #2729 from Ace-Tang/master 
runtime-v2: add validation for runtime name
 2018-10-23 16:39:51 +01:00
Michael Crosby
2f2d6a142c
Merge pull request #2741 from Random-Liu/update-cri 
Update cri to f913714917d2456d7e65a0be84962b1ce8acb487.
 2018-10-23 10:31:18 -04:00
Phil Estes
52893fbb05
Merge pull request #2740 from Ace-Tang/ctr_metric 
ctr: fix potential panic in metric
 2018-10-23 09:16:01 +01:00
Ace-Tang
c3cac72b92 ctr: fix potential panic in metric 
Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-10-23 14:01:50 +08:00
Lantao Liu
bee4cc5929 Update cri to f913714917d2456d7e65a0be84962b1ce8acb487. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-22 22:57:25 -07:00
Michael Crosby
a4b6522e11
Merge pull request #2732 from gliptak/patch-1 
Correct redundant nil check
 2018-10-22 11:17:11 -04:00
Michael Crosby
6f1a54c952
Merge pull request #2736 from gliptak/misspell1 
Misspell1
 2018-10-22 10:38:46 -04:00
Akihiro Suda
d4529076f7
Merge pull request #2735 from estesp/remove-release-tool 
Remove containerd-release tool from main repo
 2018-10-20 16:43:41 +09:00
Gábor Lipták
9d01160902
Correct spelling 
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
 2018-10-19 17:06:43 -04:00
Gábor Lipták
4a0c40664a
Correct redundant nil check 
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
 2018-10-19 16:50:17 -04:00
Phil Estes
0dd3211a06
Remove containerd-release tool from main repo 
The release-tool is now located in the `containerd/project` repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-10-19 12:13:38 -04:00
Ace-Tang
7b1b16b741 runtime-v2: add validation for runtime name 
add validation for runtime name, if runtime name is invalid,
containerd will got panic.

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-10-19 15:19:45 +08:00
Akihiro Suda
133ac5cd2a
Merge pull request #2730 from fuweid/fixtypo_in_runtime_package 
fixtypo: misspell in runtime package
 2018-10-19 10:23:54 +09:00
Derek McGowan
405518591d
Merge pull request #2727 from mikebrow/ignore-idempotence 
allow idempotence when adding a task to cgroup metrics collection
 2018-10-18 11:16:41 -07:00
Wei Fu
accadd7118 fixtypo: misspell in runtime package 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-10-18 23:21:05 +08:00
Mike Brown
879b2ae291 allow idempotence when adding a task to cgroup metrics collection 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-10-18 01:32:56 -05:00
Derek McGowan
9c1db67b3a
Merge pull request #2726 from lucperkins/lperkins/update-banner-url 
Update banner URL
 2018-10-17 13:41:05 -07:00
lucperkins
0c8a5ff72e Update banner URL 
Signed-off-by: lucperkins <lucperkins@gmail.com>
 2018-10-17 12:55:10 -07:00
Michael Crosby
f1f8cb017e
Merge pull request #2725 from fuweid/enhance_split_config_from_server 
enhance: split config from server package
 2018-10-17 10:22:51 -04:00
Wei Fu
06616dab00 enhance: split config from server package 
The github.com/containerd/containerd/services/server has a lot of
dependencies, like content, snapshots services implementation and
docker-metrics.

For the client side, it uses the config struct from server package
to start up the containerd in background. It will import a lot of
useless packages which might be conflict with existing vendor's package.

It makes integration easier with single config package.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-10-17 16:34:39 +08:00
Derek McGowan
483724b0df
Merge pull request #2724 from crosbymichael/runc-lxc 
Update runc to 58592df56734acf62e574865fe40b9e53e
 2018-10-16 15:05:15 -07:00
Michael Crosby
d7769daa5e Update runc to 58592df56734acf62e574865fe40b9e53e 
This includes fixes for user namespaces as well as a long standing bug
for running docker and containerd inside an lxc container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-10-16 15:47:41 -04:00
Derek McGowan
d6de12e2f3
Merge pull request #2723 from dmcgowan/update-version-rc.2 
Update version to 1.2.0-rc.2
 2018-10-16 11:03:45 -07:00
Derek McGowan
5e810c3e3d
Update version to 1.2.0-rc.2 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-16 10:26:16 -07:00
Michael Crosby
f1dfe86ef4
Merge pull request #2688 from crosbymichael/ctrdecodespec 
decode spec in `ctr c info`
 2018-10-16 09:38:43 -04:00
Michael Crosby
9fe52f66d6
Merge pull request #2721 from Ace-Tang/master 
ctr: add some metric item
 2018-10-16 09:38:30 -04:00
Ace-Tang
7ea75ef4a9 ctr: add some metric item 
add memory limit, pid info into metric subcommand, since moby also
show them. As blkio read/write IO need more calculation，not add them.

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-10-16 16:54:06 +08:00
Michael Crosby
acc3b839d3
Merge pull request #2714 from dmcgowan/fix-content-deadlock-after-error 
Fix writer deadlock in local store
 2018-10-15 21:17:45 -04:00
Michael Crosby
fdc4e1f426
Merge pull request #2720 from crosbymichael/stress-root 
Fix stress test for image config opt requirements
 2018-10-15 21:17:12 -04:00
Derek McGowan
0f756495a9
Fix writer deadlock in local store 
The local store could end up in a state where the writer is
closed but the reference is locked after a commit on an
existing object.
Cleans up Commit logic to always close the writer even after
an error occurs, guaranteeing the reference is unlocked after commit.
Adds a test to the content test suite to verify this behavior.
Updates the content store interface definitions to clarify the behavior.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-15 16:33:45 -07:00
Michael Crosby
e86a0689fb Fix stress test for image config opt requirements 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-10-15 18:58:16 -04:00
Derek McGowan
d725ebe446
Merge pull request #2718 from jterry75/update_runhcs 
Revendor github.com/Microsoft/hcsshim
 2018-10-15 15:13:44 -07:00
Justin Terry (VM)
3f1d9b2c4f Revendor github.com/Microsoft/hcsshim 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-10-15 13:38:24 -07:00
Michael Crosby
5993d096ff
Merge pull request #2691 from fuweid/bugfix_cache_empty_label 
bugfix: cache empty layer for docker schema1 image
 2018-10-15 15:43:23 -04:00
Michael Crosby
3f5e6cdeaa
Merge pull request #2717 from dmcgowan/diff-set-uncompressed-label 
Set uncompressed label on diff when already exists
 2018-10-15 15:16:21 -04:00
Derek McGowan
26506e9e23
Update empty layer label 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-15 11:28:45 -07:00
Derek McGowan
bb197ddc47
Set uncompressed label on diff when already exists 
Diff expects to set the uncompressed label on Commit, however
if the blob already exists in the content store, no labels
will get set, requiring an Update. Check if the uncompressed
label is on the blob and set it if not.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-10-15 11:02:35 -07:00
Michael Crosby
50c020f4d5
Merge pull request #2716 from estesp/reference-common-project-repo 
Reference common project repo contents
 2018-10-15 11:46:36 -04:00
Phil Estes
bd93a66fc2
Use common project repo copies of travis scripts 
Remove local copies of common containerd/project located scripts for
DCO, fileheader, and vendor checks.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-10-15 09:05:48 -04:00
Phil Estes
6f3288333c
Move common repository details to project references 
Now that all the content is set up appropriately in the
containerd/project repo, remove local copies and point to the common
project content from the containerd README.md

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-10-15 09:05:37 -04:00
Akihiro Suda
0146a48cb8
Merge pull request #2712 from nogoegst/mount-openbsd 
mount: add support for OpenBSD
 2018-10-13 11:23:21 +09:00
Akihiro Suda
61f4ecb1e1
Merge pull request #2713 from nogoegst/archive-openbsd 
archive: add support for OpenBSD
 2018-10-13 11:22:34 +09:00
Ivan Markin
a20603090f archive: add support for OpenBSD 
Signed-off-by: Ivan Markin <sw@nogoegst.net>
 2018-10-12 22:29:24 +00:00
Ivan Markin
0828b7aa96 mount: add support for OpenBSD 
Signed-off-by: Ivan Markin <sw@nogoegst.net>
 2018-10-12 22:24:13 +00:00
Phil Estes
1a5f9a3434
Merge pull request #2710 from fuweid/enhance_support_duration_for_cpu_profile_collection 
enhance: support specific duration for profile collection
 2018-10-11 11:00:25 -04:00
Phil Estes
09aa58bee5
Merge pull request #2705 from jterry75/detachvhd 
Dismount sandbox VHD on snapshot remove
 2018-10-11 10:35:26 -04:00
Derek McGowan
f67459929e
Merge pull request #2700 from jiria/jiria/add-windows-arm-support 
Add support to detect ARM variant on Windows
 2018-10-10 16:47:54 -07:00
Jiri Appl
e6529f4ebc Add support to detect ARM variant on Windows 
ARM variant detection logic was authored originally with
POSIX OS in mind. This change leaves POSIX code path unaltered
and adds support to detect ARM variant on Windows by leveraging
runtime.goarch.

Signed-off-by: Jiri Appl <jiria@microsoft.com>
 2018-10-10 14:17:11 -07:00