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

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
a2dbc6ec1c Merge pull request #261 from ijc/volume-copyup 
Implement volume copy up.
 2017-09-20 02:30:36 -07:00
Lantao Liu
9c533dca14 Merge pull request #262 from ijc/sandbox-getip-improvements 
Do not attempt to retrieve IP from host network namespace
 2017-09-20 02:22:07 -07:00
Ian Campbell
9c3c38d9ab Do not attempt to retrieve IP from host network namespace 
Since sandboxes which use the host network have no network namespace path this
would result in an invalid invocation of nsenter.

Rework the fetching of the sandbox to take this into account and also avoid
trying to get an IP when the network plugin is not yet ready.

Fixes #245.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-20 09:53:56 +01:00
Ian Campbell
8c6ba35038 Implement volume copy up. 
This pulls in and uses github.com/docker/docker/pkg/chrootarchive for the
actual copy up which is some battle hardened code to unpack avoiding things
like symlink traversal security issues.

However it does pull in a pretty huge pile of vendoring, including
github.com/docker/docker/pkg/reexec which we must then call at startup. It's
not immediately clear that this tradeoff is the correct one.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-20 09:52:27 +01:00
Lantao Liu
9d8f74227f Merge pull request #264 from Random-Liu/update-kubernetes 
Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace
 2017-09-19 21:26:22 -07:00
Lantao Liu
5af5a04b6f Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 01:31:26 +00:00
Lantao Liu
3647ff5976 Merge pull request #263 from Random-Liu/fix-log 
Fix one line of log, we are writing not reading.
 2017-09-19 13:24:28 -07:00
Lantao Liu
45f98a0b39 Fix one line of log, we are writing not reading. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-19 18:53:45 +00:00
Michael Crosby
d700a9c35b Merge pull request #1500 from crosbymichael/typeurl 
Use external typeurl package
 2017-09-19 11:03:52 -04:00
Michael Crosby
d22160c28e Vendor typeurl package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-19 09:43:55 -04:00
Michael Crosby
929283a3ab Remove typeurl package from repo 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-19 09:43:31 -04:00
Lantao Liu
437131299b Merge pull request #230 from miaoyq/ensure-mount-shared-slave 
Ensure the mount point is propagated
 2017-09-19 00:56:27 -07:00
Yanqiang Miao
49eb38a5d4 Ensure the mount point is propagated 
mount with `rshared`, the host path should be shared.
mount with `rslave`, the host pash should be shared or slave.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-09-19 14:21:21 +08:00
Lantao Liu
7d25e7a832 Merge pull request #258 from Random-Liu/gcr-private-registry 
Gcr private registry and node e2e fix
 2017-09-18 12:47:09 -07:00
Michael Crosby
f41871be9d Merge pull request #1515 from dmcgowan/add-akihiro 
Add Akihiro as maintainer
 2017-09-18 15:38:04 -04:00
Lantao Liu
7f8f563019 Enable gcr private registry node e2e test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-18 18:19:26 +00:00
Lantao Liu
91ca178275 Update containerd to include the gcr private registry fix 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-18 18:19:26 +00:00
Kenfe-Mickaël Laventure
0cb2c961b2 Merge pull request #1519 from crosbymichael/contrib 
Add readme to contib
 2017-09-18 10:50:46 -07:00
Michael Crosby
58015abbd5 Add readme to contib 
Closes #1442

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-18 11:47:27 -04:00
Kenfe-Mickaël Laventure
e517952bc7 Merge pull request #1378 from cpuguy83/container_store_extra_data 
Add `Container` field to store client-defined data
 2017-09-18 07:32:07 -07:00
Michael Crosby
59384ffdb0 Merge pull request #1522 from qingyunha/master 
README.md: correct headers level
 2017-09-18 10:06:28 -04:00
Lantao Liu
a8d4940285 Merge pull request #227 from yanxuean/tomldefault 
Add a default config file
 2017-09-17 22:38:40 -07:00
Lantao Liu
06a305d7ea Merge pull request #255 from Random-Liu/use-config-in-service 
Use config in service.
 2017-09-17 22:37:06 -07:00
yanxuean
c24a5db242 Add a default config file 
fix #226

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-18 08:57:10 +08:00
Lantao Liu
c61757986e Merge pull request #253 from Random-Liu/format-code-a-bit 
Format the code a bit.
 2017-09-17 12:23:57 -07:00
Lantao Liu
8a03d551da Merge pull request #252 from abhinandanpb/rshared 
Setting rootfs mount propagation if the mount type is rshared/shared
 2017-09-17 12:23:39 -07:00
Abhinandan Prativadi
abba4e22f6 Setting rootfspropagation if the mount type shared or slave 
This is needed by runc to mount volume for containers that expect
biderectional file updates or host to container updates.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-17 09:59:45 -07:00
Lantao Liu
71b0d0a043 Use config in service. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-17 06:46:40 +00:00
Lantao Liu
3f305e2cf4 Format the code a bit. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-17 03:22:21 +00:00
Tao Qingyun
e1ce48d5d2 README.md: correct headers level 
Signed-off-by: Tao Qingyun <845767657@qq.com>
 2017-09-17 07:24:25 +08:00
Lantao Liu
da31647ef8 Merge pull request #247 from ijc/volumes-support 
Add image volume support.
 2017-09-15 14:33:27 -07:00
Phil Estes
b6a0fb137e Merge pull request #1518 from crosbymichael/security 
Update security reporting text
 2017-09-15 08:49:27 -07:00
Phil Estes
8ac9743414 Merge pull request #1510 from crosbymichael/signals 
Handle signals first on boot
 2017-09-15 08:48:21 -07:00
Michael Crosby
2e830e0dc0 Update security reporting text 
Closes #1441

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-15 11:32:14 -04:00
Michael Crosby
72f380af45 Merge pull request #1517 from mlaventure/remove-toml-omitempty 
Remove omitempty from toml tags
 2017-09-15 11:30:01 -04:00
Michael Crosby
4bfe3a9998 Merge pull request #1516 from tklauser/fix-cstring-leaks 
mount: fix CString memory leaks
 2017-09-15 10:06:20 -04:00
Michael Crosby
7fdf8cd31e Handle signals first on boot 
This handles signals first thing on boot so that plugins are able to
boot with the reaper enabled.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-15 10:00:19 -04:00
Lantao Liu
cd27050425 Add image volume support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-15 11:25:55 +01:00
Ian Campbell
e0079125d2 Move resolveSymbolicLink to OS package and stub out for tests 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-15 11:25:45 +01:00
Ian Campbell
56539bd3a4 Require generateContainerSpec passes during tests and abort if not 
This is achieved by switching `assert.NoError` to `require.NoError` in several
places.

Otherwise the test code will continue and dereference a nil spec, leading to a
panic which obscures the real failure.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-15 11:06:25 +01:00
Tobias Klauser
4a582405b9 mount: fix CString memory leaks 
Make sure to call C.free on C strings allocated using C.CString.

C.CString allocates memory in the C heap using malloc. It is the callers
responsibility to free them. See
https://golang.org/cmd/cgo/#hdr-Go_references_to_C for details.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2017-09-15 10:55:53 +02:00
Derek McGowan
3596ec53ab
Add Akihiro as maintainer 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-09-14 23:57:36 -07:00
Kenfe-Mickael Laventure
f2d1459929
Remove omitempty from toml tags 
The encoder only support changing the name of the key.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-14 20:49:22 -07:00
Kenfe-Mickaël Laventure
cf1d4223be Merge pull request #1511 from crosbymichael/solaris 
Remove solaris from travis
 2017-09-14 15:23:05 -07:00
Lantao Liu
3ac019fa36 Merge pull request #244 from mikebrow/containerd-update-9-13 
update vendor for containerd, cri-tools, and runc
 2017-09-14 13:59:45 -07:00
Michael Crosby
6d440dc223 Remove solaris from travis 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-14 16:29:00 -04:00
Kenfe-Mickaël Laventure
63654f911f Merge pull request #1509 from crosbymichael/ns-event 
Set ctx ns before publish
 2017-09-14 12:34:03 -07:00
Phil Estes
d1e11f17ec Merge pull request #1465 from AkihiroSuda/gcr 
remotes/docker: add scope (registry:foo/bar:pull)
 2017-09-14 11:22:26 -07:00
Michael Crosby
14c36cca60 Set ctx ns before publish 
Fixes #1497

This sets the namespace on the context when deleting a namespace so that
the publish event does not fail.  Use the same namespace as you are
deleting for the context.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-14 13:54:57 -04:00
Mike Brown
8310fb4bfd update vendor 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-14 12:24:00 -05:00