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

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
240a7be607 Merge pull request #1371 from dmcgowan/btrfs-test-errors 
Update mount creation to only use btrfs subvolume id
 2017-08-17 11:36:25 -04:00
Michael Crosby
06dc87ae59 Wait for client side copy goroutines to start 
Make sure we wait for the client side copy goroutines to start coping
from the fifos before returning from the function.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-17 10:58:56 -04:00
Lantao Liu
8e9a251f72 Merge pull request #135 from yanxuean/myfeature 
The parameters of InitCNI should be filled in reverse order
 2017-08-16 19:50:22 -07:00
yanxuean
8cc0347b0a The parameters of InitCNI should be filled in reverse order. 
fix  #131

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-08-17 10:18:40 +08:00
Lantao Liu
860dac233f Merge pull request #130 from Random-Liu/add-port-forward 
Add portforward support.
 2017-08-16 17:47:34 -07:00
Lantao Liu
f555bb1242 Add portforward support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-17 00:13:31 +00:00
Lantao Liu
1ae4ee8325 Merge pull request #113 from abhinandanpb/client 
Replacing containerd GRPC API with client
 2017-08-16 16:45:04 -07:00
Abhinandan Prativadi
32e0313418 Containerd client integration 
This commit:
1) Replaces the usage of containerd GRPC APIs with the containerd client for all operations related to containerd.
2) Updated containerd to v1.0alpha4+
3) Updated runc to v1.0.0

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-16 14:43:22 -07:00
Michael Crosby
bfd62ceba9 Defer unlock for testing daemon 
Make sure we use defer when unlocking the daemon during testing.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-16 16:29:43 -04:00
Michael Crosby
73ac66eecf Merge pull request #1352 from ijc/userns 
correct container "/" ownership with userns
 2017-08-16 16:09:44 -04:00
Derek McGowan
0e28f2c76e
Update mount creation to only use btrfs subvolume id 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-16 13:00:54 -07:00
Ian Campbell
ebafab47ca correct container "/" ownership with userns 
Previously "`/`" in a container was always owned by `root:root` (0/0), even if
`withRemappedSnapshot` had been used. Meaning that if `withUserNamespace` is
used then `/` can be remapped to `nobody:nogroup` (65534/65534).

The fix is is twofold:

- incrementFS should operate on the root of the tree.
- when creating a new snapshot we must propagate the ownership of the topmost
  "lower" directory into the new "upper".

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-08-16 19:55:55 +01:00
Akihiro Suda
e03ecd30a7 ctr: add ctr snapshot view 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-08-16 08:40:11 +00:00
Lantao Liu
76652ef49a Merge pull request #134 from mikebrow/goversionupdate 
Putting in the go versions we want to test against
 2017-08-15 22:38:23 -07:00
Mike Brown
f3c12edf3b parallel script execution for each go version within stage 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-08-16 00:20:43 -05:00
Derek McGowan
4703b99ac0 Merge pull request #1364 from AkihiroSuda/fix-ctr-snapshot-commit 
ctr: fix `ctr snapshot commit`
 2017-08-15 14:44:23 -07:00
Mike Brown
7d1b3a5af8 adding stages to test the right go versions 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-08-15 10:52:11 -05:00
Michael Crosby
62cebf9f1f Merge pull request #1365 from AkihiroSuda/stress 
stress -> containerd-stress
 2017-08-15 11:03:04 -04:00
Akihiro Suda
f8b1f4f6dc stress -> containerd-stress 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-08-15 14:54:20 +00:00
Mike Brown
f2a228b6f8 Merge pull request #129 from mbssaiakhil/patch-1 
Fix Typo in Events Code of Conduct
 2017-08-15 09:36:30 -05:00
Malepati Bala Siva Sai Akhil
5ce5868bf1 Fix Typo in Events Code of Conduct 
Signed-off-by: Malepati Bala Siva Sai Akhil <malepatib.akhil@huawei.com>
 2017-08-15 19:37:07 +05:30
Akihiro Suda
ca352220b5 ctr: fix ctr snapshot commit 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-08-15 08:14:54 +00:00
Lantao Liu
7ba0679e14 Merge pull request #132 from asifdxtreme/patch-1 
Split the travis Build in different Build and Test Stage
 2017-08-14 21:07:56 -07:00
asifdxtreme
b927292327 Update stage as per suggestion 
Signed-off-by: asifdxtreme <mohammad.asif.siddiqui1@huawei.com>
 2017-08-15 10:02:20 +08:00
Mohammad Asif Siddiqui
b55e75b55e Split Travis Build in Stages 
Signed-off-by: asifdxtreme <mohammad.asif.siddiqui1@huawei.com>
 2017-08-15 09:32:42 +08:00
Stephen Day
a64399acc2 Merge pull request #1341 from mlaventure/enable-test-parallelism 
Enable test parallelism
 2017-08-14 15:18:37 -07:00
Stephen Day
72159bf4a4 Merge pull request #1325 from dmcgowan/diffid-labels 
content: commit options
 2017-08-14 15:17:37 -07:00
Kenfe-Mickael Laventure
2abaf6e964
Fix possible deadlock in WithProcessKill 
We were not checking the error value of `Kill` leading to deadlock if the
process didn't exist.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-14 14:43:43 -07:00
Kenfe-Mickael Laventure
b02e9a844e
Fix TestContainerNoBinaryExists on windows 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-14 14:43:43 -07:00
Kenfe-Mickael Laventure
104a8088ca
Add integration-parallel to Travis & AppVeyor CIs 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-14 14:43:43 -07:00
Kenfe-Mickael Laventure
eb0970bbd1
Mark relevant tests as elligible for parallelism 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-14 14:43:43 -07:00
Stephen Day
938810e706 Merge pull request #1311 from abhinandanpb/client_int 
Exposing helper functions  to access internal image information
 2017-08-14 14:03:26 -07:00
Stephen Day
ca6b46320a Merge pull request #1343 from Random-Liu/change-io-to-interface 
Change IO to interface.
 2017-08-14 13:28:34 -07:00
Michael Crosby
dbb63b636b Merge pull request #1346 from stevvooe/disallow-runtime-update 
metadata: disallow changing the runtime of an existing container
 2017-08-14 15:15:43 -04:00
Lantao Liu
8e2c95f9c1 Change IO to interface. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-14 18:53:12 +00:00
Phil Estes
c288fbe973 Merge pull request #1354 from crosbymichael/null-io 
Add null io option
 2017-08-14 14:30:00 -04:00
Stephen Day
6a4a09d3c9 Merge pull request #1351 from jessvalarezo/check-nil-spec 
metadata: container spec nil check
 2017-08-14 11:29:16 -07:00
Michael Crosby
eb58ecab7c Add null io option 
This adds null IO option for efficient handling of IO.
It provides a container directly with `/dev/null` and does not require
any io.Copy within the shim whenever a user does not want the IO of the
container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-14 13:09:16 -04:00
Kenfe-Mickaël Laventure
cf1b59348e Merge pull request #1348 from AkihiroSuda/remove-unused 
rootfs: remove unused functions
 2017-08-14 08:21:27 -07:00
Jess Valarezo
e5cf1471dc metadata: container spec nil check 
Prevent panic from Marshal on a nil container spec

Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-08-13 19:00:28 -07:00
Phil Estes
77035a6e65 Merge pull request #1345 from crosbymichael/gorunc 
Update go-runc to b85ac701de5065a66918203dd18f05
 2017-08-12 12:04:40 -04:00
Akihiro Suda
4e2337794c rootfs: remove unused functions 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-08-12 07:08:28 +00:00
Derek McGowan
ca9dec32de Merge pull request #1329 from tophj-ibm/change-test-image 
Change testImage based on GOARCH
 2017-08-11 22:38:51 -07:00
Abhinandan Prativadi
7a5d592372 Exposing helpers to access internal structure 
Adding image.Config,image.Size,image.RootFS to retrieve the internal image information
which will be needed by consumers of containerd

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-11 17:09:29 -07:00
Stephen Day
a3801b73fb Merge pull request #1344 from crosbymichael/ops 
Add section for `state` dir
 2017-08-11 16:21:20 -07:00
Stephen J Day
d7689418ed
metadata: disallow changing the runtime of an existing container 
This could render tasks for a container unresolvalbe. If there is a use
case for changing the runtime of a container, we should think it through
carefully.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-08-11 16:19:25 -07:00
Lantao Liu
83a20c9fd1 Merge pull request #127 from Random-Liu/containerd-spec-tty 
Use containerd spec generator to set tty.
 2017-08-11 14:49:17 -07:00
Derek McGowan
da34812db6
Update differ to support compressed archives 
Differ is updated to set a label for the uncompressed hash
of compressed content. This allows compressed blobs to
be used and looked up for their uncompressed hashes.
Uses commit options to set labels.
Updates rootfs default to create compressed archives.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-11 14:19:04 -07:00
Michael Crosby
fa3454e54d Update go-runc to b85ac701de5065a66918203dd18f05 
This includes fixes for pipe ownership and NullIO options.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-11 17:15:25 -04:00
Derek McGowan
dee8dc2cda
Add support for content labels on commit 
Add commit options which allow for setting labels on commit.
Prevents potential race between garbage collector reading labels
after commit and labels getting set.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-11 14:15:20 -07:00