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

4032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jess Valarezo
d8abb61bed Update building doc for Docker for Mac users 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-08-17 10:21:03 -07:00
Phil Estes
89daacfe3f Merge pull request #1370 from crosbymichael/daemon-lock 
Defer unlock for testing daemon
 2017-08-17 11:44:44 -04:00
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
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
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
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
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
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
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
Derek McGowan
c4387a159e
Add content test suite run to client 
Fix bugs in content deletion and upload status

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-11 14:08:34 -07:00
Michael Crosby
b1eb1103a8 Add section for state dir 
Closes #1286

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-11 16:54:42 -04:00
Phil Estes
edc51c86f2 Merge pull request #1342 from mlaventure/is-serving-failfast 
Disable FailFast on client.IsServing()
 2017-08-11 16:47:48 -04:00
Michael Crosby
f2ee71c56c Merge pull request #1339 from dmcgowan/refactor-oci-package 
Remove oci package
 2017-08-11 16:32:42 -04:00
Kenfe-Mickael Laventure
fed5ad4bc5
Update tests to properly use IsServing 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-11 13:13:13 -07:00
Kenfe-Mickael Laventure
7de9ca519c
Disable FailFast on client.IsServing() 
User of the client should associate a proper timeout with the context
instead.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-11 13:13:13 -07:00
Christopher Jones
661bcd3e4d
Change test image based on platform 
This changes testImage so it can be run on other platforms.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2017-08-11 14:48:14 -04:00
Derek McGowan
a437d140f8
Remove oci package 
Replace functionality in client with simple tar writer

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-11 11:48:14 -07:00
Phil Estes
a6be9f544d Merge pull request #1338 from mlaventure/client-reconnect-fix 
Client reconnect fix
 2017-08-11 14:30:05 -04:00
Kenfe-Mickael Laventure
5f36ac2093
Add test to ensure we can access tasks on restart 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
e661be6a9c
Fix failure to connect to shim on daemon restart 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
7ac351cdfe
Share Dialer and DialAddress between client and shim 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
587a811d09
Check credentials when connecting to shim 
NewUnixSocketCredentials was actually never invoked before.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-11 09:34:29 -07:00