Commit Graph

5531 Commits

Author SHA1 Message Date
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
kadisi
40267382c5 fix ctr image export not found error
Signed-off-by: Jie Zhang <iamkadisi@163.com>
2018-12-17 08:52:28 +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
Justin Terry (VM)
7ac221e8d7 Adding ctr memory and cpu flags
Adds ctr run --memory-limit for all platforms.
Adds ctr run --cpu-count for Windows platforms.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-12-10 13:31:59 -08:00
Michael Crosby
f05672357f
Merge pull request #2859 from crosbymichael/shim-config
Add shim config for shim binary options
2018-12-10 14:15:22 -05:00
Michael Crosby
822ae18b14 Update cgroups to 1152b960fcee041f50df15cdc67c29db
```
1152b960fcee041f50df15cdc67c29dbccf801ef (HEAD -> master, origin/master)
Merge pull request #73 from gliptak/gofmt1
afd5981a16647b45b6dba3a50a88418b576cc17d Gofmt cgroup_test
65ce98b3dfeb0a9a8fecd7e4ebffb24ad0bfe28f Merge pull request #69 from
cclerget/master-weight-pointer
0f372c6d4a65a49c72b0afbd1aee6214637958bf Merge pull request #71 from
JoeWrightss/patch-1
f48bd85c9cbc306fada0cebc3a646a1f1fe99afe Fixs return error message
10cd53efd916e22b9bdea67223d287684f57f1f4 Merge pull request #70 from
gliptak/patch-1
64bade4cea6c438ee51a7a12528225946b42c6ca Take value instead of pointer
value
b49c4713f3824e81bfa67faddcdde1414171b54e Correct ineffassign warning
3bc6dde829bc2dc8d4097ce8ad5acc275de3df06 Merge pull request #68 from
cclerget/master-net_prio-typo
6b552a86e60e31903d3f8f3f494eda71f562cc54 Fix net_prio typo
c0437c3dd5958f74d7f54e9f5def749850b9d6a1 Merge pull request #67 from
gpanouts/get-all-cgroup-tasks
a31a0ff985237eddf30d9fe30a3643c7da4ae912 Add functionality for
retrieving all tasks of a cgroup
82cb49fc1779971dfef4ad696f1453f6f44987b1 Merge pull request #63 from
ChrsMark/lenient-subsystems-checking
7d825b29aecc02bb1e9bede427f8ed62bbc3030d Add test for cgroups load when
missing hierarchy in one subsystem
f6cbfb45aec6a2590c7e7f4b84a080602b3e642d Change Load function in order
to be more lenient on subsystems' checking
965bb1da4db7c8ce2690108c5a081562ce7493cb Merge pull request #66 from
crosbymichael/systemdci
ab9ec0e4abde2c2cb999719ff43af2d3b5830f75 (fork/systemdci, systemdci) Add
go-systemd dep for CI testing
0e94a83b6eb6cf4bc05d7f91ec1eaad57a77d3b6 Merge pull request #59 from
gliptak/patch-1
4479d118c89b5500a08cce7a78bbe822229c1e65 Merge pull request #62 from
estesp/fix-gofmt
9beb998c23f510b1e6670ad7791807eb9aff6741 Merge pull request #61 from
gliptak/patch-3
9a09e5899acc95fabcc620d6489fec674e6dddfa Fix gofmt of systemd.go
84e6e6ed2afdf661cd9dbf47c6f3412b546bc67f Merge pull request #60 from
gliptak/patch-2
e13f6cc3b9637c36e6a8af393b561127498f4be5 Add GoReportCard badge to
README
d124595ee85c245e7c1443fe402adf7ce4f7f6a4 Add Go 1.11 to Travis
d961ab930c38eb8bedcded479f1708b2ef4984c5 Correct typo
d2400726cfa7904fb79e3b896ec0e6ae500a76bd Merge pull request #57 from
estesp/project-update
e4cf832b95deb7ce898ece716307abc35cbd0a09 Add project references and use
common project travis
8baeff6b9d069acde48ef1bedec7e0f8ba684f05 Merge pull request #56 from
grantseltzer/patch-1
9de57ffeb46f6179333d7939436d92dcb5631e5f Add godoc badge to README.md
5017d4e9a9cf2d4381db99eacd9baf84b95bfb14 Merge pull request #54 from
WeiZhang555/bugfix
13aaafdc37e772059d3234ec762303537f440c5b Bugfix: can't write to cpuset
cgroup
58556f5ad8448d99a6f7bea69ea4bdb7747cfeb0 Merge pull request #53 from
baude/systemdslicedelegate
15ed73c1c075e6590ecf56170acedcba0da8167e systemd-239+ no longer allows
delegate slice
3024bc7cc0c88af4b32d38a14444f38e65ab169f Merge pull request #52 from
Sykomaniac/bugfix/slice-name
2596f332e449ea374f0f24a977437116714ce7ef Remove call to unitName
2e2922e146ed53ccf4481c245187b6afe244fded Merge pull request #51 from
containerd/type
0f3de2f77d3b76b3871242fbab2a6116179229af (type) Fix empty device type
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-10 11:58:45 -05:00
Michael Crosby
3ae8e8a30b Add shim config for shim binary options
Fixes #2855

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-05 13:14:26 -05:00
Derek McGowan
0b0d6e6bdd
Merge pull request #2857 from crosbymichael/runc-kill-paused
Update runc to 96ec2177ae841256168fcf76954f7177af
2018-12-04 14:19:01 -08:00
Michael Crosby
66c20f2b75 Update runc to 96ec2177ae841256168fcf76954f7177af
This fixes a regression in runc that didn't allow signals being sent to
paused containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-04 11:21:20 -05:00
Michael Crosby
4a8acf54b1
Merge pull request #2793 from lifubang/runexecflag
fix container cmd args may parsed as ctr args
2018-12-04 11:05:51 -05:00
Michael Crosby
8ccfe2a73f
Merge pull request #2853 from jterry75/revendor_hcssshim_v0.8.3
Revendor github.com/Microsoft/hcsshim to v0.8.3
2018-12-04 10:26:15 -05:00
Phil Estes
6937c5a3ba
Merge pull request #2854 from Random-Liu/kill-in-stopped-state
Allow Kill in stopped state
2018-12-04 09:29:50 +01:00
Lantao Liu
79499980e4 Kill should still work in stopped state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-03 16:57:20 -08:00
Justin Terry (VM)
27ba2db109 Revendor github.com/Microsoft/hcsshim to v0.8.3
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-12-03 16:08:05 -08:00
Michael Crosby
2175efcf99
Merge pull request #2851 from lifubang/execdpatch
fixes: should no defer when detach
2018-12-03 11:22:37 -05:00
Lifubang
2d3a4f99ec should no defer when detach
Signed-off-by: Lifubang <lifubang@acmcoder.com>
2018-12-03 19:18:57 +08:00
Michael Crosby
09a5b1f8af
Merge pull request #2839 from jhowardmsft/jjh/service
Windows: Allow running as a service
2018-11-30 11:11:16 -05:00
Michael Crosby
620d56aa42
Merge pull request #2846 from thaJeztah/mask_asound
Add /proc/asound to masked paths
2018-11-30 10:58:01 -05:00