github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
4,295 Commits 3 Branches 4 Tags
adfaa697a8b778eb319a49c02406c84bc0f1bdf9
Commit Graph

4295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
adfaa697a8 Merge pull request #2887 from andrey-ko/args-fix 
fix oci.WithImageConfigArgs for windows
 2019-01-07 17:00:25 -05:00
Michael Crosby
b5a794649a Merge pull request #2911 from estesp/security-audit 
Add security audit report to README
 2019-01-07 12:01:13 -05:00
Michael Crosby
fcf5462d49 Merge pull request #2914 from jterry75/runhcs_runtime_opts 
Update runhcs options to include CRI Sandbox support
 2019-01-07 11:54:41 -05:00
Michael Crosby
30003c4439 Merge pull request #2910 from jterry75/shim_shutdown_error_log 
Fix spurious ttrpc client shutdown error log on success
 2019-01-07 11:54:07 -05:00
Justin Terry (VM)
bc76e01a87 Update runhcs options to include CRI Sandbox support 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-04 14:37:10 -08:00
Phil Estes
a79879e9dd Add security audit report to README 
Also remove weekly development reports section from README as those are
not being produced regularly at this time.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-01-04 09:56:03 -05:00
Justin Terry (VM)
dee0945e18 Fix spurious ttrpc client shutdown error log on success 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-01-03 13:44:29 -08:00
Akihiro Suda
231bff7f60 Merge pull request #2909 from Random-Liu/update-cri 
Update cri to 4b4b2abb2e.
 2019-01-03 06:48:05 +09:00
Lantao Liu
64a0046416 Update cri-tools to v1.13.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-02 12:54:55 -08:00
Lantao Liu
b55c9c6c35 Update cri to 4b4b2abb2e. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-02 10:50:25 -08:00
Akihiro Suda
6ba92a7921 Merge pull request #2908 from JoeWrightss/patch-2 
Fix annotation typo errors
 2019-01-01 16:08:02 +09:00
JoeWrightss
17b77aeb0e Fix annotation typo errors 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-31 22:40:06 +08:00
Phil Estes
47b328aab7 Merge pull request #2897 from crosbymichael/atomic-delete 
Ensure bundle removal is atomic
 2018-12-21 08:27:43 -05:00
akolomentsev
1be86af108 add test for WithImageConfigArgs 
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
 2018-12-20 18:15:24 -08:00
Michael Crosby
36e4dc603e Ensure bundle removal is atomic 
This makes bundle removal atomic by first renaming the bundle and
working directories to a hidden path before removing the underlying
directories.

Closes #2567
Closes #2327

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-12-20 13:45:18 -05:00
Phil Estes
06e04bc5a9 Merge pull request #2830 from Ace-Tang/support_cr_without_image 
cr: support checkpoint/restore without image
 2018-12-20 13:24:37 -05:00
Michael Crosby
9b366b2329 Merge pull request #2894 from thaJeztah/remove_website_leftovers 
docs: remove website leftovers
 2018-12-20 09:21:01 -05:00
Sebastiaan van Stijn
723797d320 docs: remove website leftovers 
The website content moved to the github.com/containerd/containerd.io
repository.

Commit da1fba0050 removed all website-
related content, but there were some stray files left behind.

This patch removes those files, and updates the `.editorconfig` file
to only match Markdown files.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-12-20 10:01:51 +01:00
Ace-Tang
d4ecb00f6f checkpoint: return empty image if checkpointPath exist 
Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-12-20 14:48:44 +08:00
akolomentsev
f2344db40a do not mutate defaults in replaceOrAppendEnvValues 
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
 2018-12-19 16:38:22 -08:00
akolomentsev
da9471fb11 fix oci.WithImageConfigArgs for windows 
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
 2018-12-19 12:25:36 -08:00
Phil Estes
48bebbb6e0 Merge pull request #2891 from thaJeztah/revert_temp_golang_fix 
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
 2018-12-19 13:34:44 -05:00
Sebastiaan van Stijn
897afeaf35 Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)" 
This reverts commit 52de371700.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-12-19 19:05:30 +01:00
Michael Crosby
f8fcf074bd Merge pull request #2885 from jterry75/runtime_v2_docs 
Update the delete docs for Runtime V2 on Windows
 2018-12-18 11:52:45 -05:00
Justin Terry (VM)
0ec6526fd3 Update the delete docs for Runtime V2 on Windows 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-12-17 13:26:57 -08:00
Michael Crosby
b62f3b6fe9 Merge pull request #2883 from ZYecho/fix-args 
fix: use func args instead of build new one
 2018-12-17 14:27:32 -05:00
Michael Crosby
081921628e Merge pull request #2875 from ZYecho/fix-defer 
fix: fix defer in loop
 2018-12-17 14:22:30 -05:00
Phil Estes
1e2cbf3310 Merge pull request #2884 from justincormack/freebsd 
Fix freebsd build
 2018-12-17 08:18:38 -05:00
Ace-Tang
e20ba5fa51 test: add test for c/r without image 
add test for both v1, v2 runtime

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-12-17 12:51:14 +08:00
Justin Cormack
8be05eb237 Fix freebsd build 
This brings freebsd in line with Darwin, ie it builds, but some parts may not yet
be fully functional. There is now a WIP `runc` port for FreeBSD at
https://github.com/clovertrail/runc/tree/1501-SupportOnFreeBSD so should be able
to test further.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2018-12-16 14:27:42 +00:00
zhangyue
7b1e6f323a fix: use func args instead of build new one 
Signed-off-by: zhangyue <zy675793960@yeah.net>
 2018-12-16 15:07:12 +08:00
zhangyue
9baecf66b8 fix: fix defer in loop 
Signed-off-by: zhangyue <zy675793960@yeah.net>
 2018-12-16 13:16:23 +08:00
Michael Crosby
c7e31f1c5e Merge pull request #2876 from fuweid/bugfix_missing_snapshot_gc 
bugfix: unpack should always set the snapshot gc label
 2018-12-14 15:21:35 -05:00
Derek McGowan
e6879c498b Merge pull request #2882 from JoeWrightss/patch-1 
Fix annotation typo error
 2018-12-14 11:25:04 -08:00
Michael Crosby
c3a5e25cbe Merge pull request #2877 from crosbymichael/fifo-timeout 
Add timeout and cancel to shim fifo open
 2018-12-14 13:13:10 -05:00
JoeWrightss
903abf33cf Fix annotation typo error 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-14 23:18:42 +08:00
Michael Crosby
121d48a7b7 Merge pull request #2879 from thaJeztah/fix_ci_golang_1.11 
Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
 2018-12-14 10:14:26 -05:00
Sebastiaan van Stijn
52de371700 Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround) 
Attempt to fix CI is failing due to a regression in Go 1.10.6 / 1.11.3 (see https://github.com/golang/go/issues/29241)

```
package github.com/containernetworking/plugins/...: github.com/containernetworking/plugins/...: invalid import path: malformed import path "github.com/containernetworking/plugins/...": double dot
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-12-14 15:35:10 +01:00
Wei Fu
2d96aad771 bugfix: unpack should always set the snapshot gc label 
There are two images, A and B. A is based on B. If user pulls A first,
then user pulls B. containerd already has the unpacked snapshots in the
backend. During unpacking B, the client doesn't set gc snapshot
reference label to the config descriptor. That is the problem.

The gc module cannot reach the snapshot from the config descriptor. If
user removes the image B, the snapshot will be deleted by gc module.
That is why we should always set the snapshot gc label to config
descriptor.

Signed-off-by: Wei Fu <fhfuwei@163.com>
 2018-12-14 09:59:19 +08:00
Michael Crosby
cc06a65a79 Merge pull request #2871 from linxiulei/fix_oauth_utf8 
Explicitly stating utf-8 when fetching oauth token
 2018-12-13 14:56:10 -05:00
Michael Crosby
a2a4241979 Add timeout and cancel to shim fifo open 
There is still a special case where the client side fails to open or
load causes things to be slow and the shim can lock up when this
happens.  This adds a timeout to the context for this case to abort fifo
creation.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-12-13 14:43:41 -05:00
Derek McGowan
7fa2f41645 Merge pull request #2873 from Ace-Tang/fix_xattr 
fix: SCHILY.xattrs should be SCHILY.xattr
 2018-12-12 22:38:23 -08:00
Phil Estes
155d7acb01 Merge pull request #2874 from ZYecho/fix-deadcode 
fix: remove dead code
 2018-12-12 21:27:32 -08:00
Ace-Tang
6f944e4190 fix: SCHILY.xattrs should be SCHILY.xattr 
from golang code
bad6b6fa91/src/archive/tar/common.go (L110)

add unit test for tar xattr

Fixes: #2863

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-12-13 09:56:26 +08:00
zhangyue
6ccb0d0629 fix: remove dead code 
Signed-off-by: zhangyue <zy675793960@yeah.net>
 2018-12-13 09:55:08 +08:00
Eric Lin
2db0c6c262 Explicitly stating utf-8 when fetching oauth token 
Fixes #2870

Signed-off-by: Eric Lin <linxiulei@gmail.com>
 2018-12-12 12:16:27 +08:00
Michael Crosby
4ccff37c7e Merge pull request #2869 from fuweid/ctr_make_error_clear_in_edit_subcommand 
ctr/content: make editor flag is required
 2018-12-11 13:51:10 -05:00
Wei Fu
603e97a9ec ctr/content: make editor flag is required 
The $EDITOR is not clear for user. If the env doesn't set the value for
$EDITOR, the users don't know how to use this subcommand when they get
error like this:

```
sh: 1: /tmp/edit-605573012: Permission denied
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-12-11 18:55:09 +08:00
Michael Crosby
1a9b010de0 Merge pull request #2868 from jterry75/cpus_mem 
Adding ctr memory and cpu flags
 2018-12-10 17:08:55 -05:00
Derek McGowan
d22f079e0c Merge pull request #2867 from crosbymichael/update-cgroups 
Update cgroups to 1152b960fcee041f50df15cdc67c29db
 2018-12-10 13:35:42 -08:00