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

2903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickael Laventure
d3e7af2c0a
containerd-shim: Refuse connection from uid/gid different from the shim process 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:50:13 -07:00
Kenfe-Mickael Laventure
95afeb7831
containerd-shim: Use abstract namespace for the unix socket 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:48:08 -07:00
Derek McGowan
6aafe66894
Add dev report for June 23, 2017 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-23 17:11:56 -07:00
Stephen Day
8644a08c96 Merge pull request #1077 from crosbymichael/shim 
Move shim API into linux sub pkg
 2017-06-23 16:50:12 -07:00
Stephen J Day
70815af652
identifiers: use common package for identifier validation 
A few days ago, we added validation for namespaces. We've decided to
expand these naming rules to include containers. To facilitate this, a
common package `identifiers` now provides a common validation area.
These rules will be extended to apply to task identifiers, snapshot keys
and other areas where user-provided identifiers may be used.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-23 16:46:45 -07:00
Michael Crosby
ba78503769 Merge pull request #1084 from stevvooe/event-conversion-tests 
events: add conversion tests
 2017-06-23 16:44:32 -07:00
Stephen J Day
cf0b221549
events: add conversion tests 
Other: How do you know these event conversions work?
Steve: Well, they've been tested and benchmarked, of course!
Other: Where are the tests?
Steve: It's easy, just check out the branch you want to test on my
       machine and the tests are right there. So easy!
Other: <facepalm>

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-23 16:33:42 -07:00
Michael Crosby
990536f2cc Move shim protos into linux pkg 
This moves the shim's API and protos out of the containerd services
package and into the linux runtime package. This is because the shim is
an implementation detail of the linux runtime that we have and it is not
a containerd user facing api.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 16:21:47 -07:00
Michael Crosby
e69423f931 Merge pull request #1079 from crosbymichael/delete 
Add DeleteOpts for container deletion
 2017-06-23 15:25:36 -07:00
Michael Crosby
6ad3ba739e Merge pull request #1073 from stevvooe/consolidate-types-package 
api/types: consolidate types package
 2017-06-23 13:58:02 -07:00
Stephen J Day
12c0daa9c9
api/types: consolidate types package 
To simplify use of types, we have consolidate the packages for the mount
and descriptor protobuf types into a single Go package. We also drop the
versioning from the type packages, as these types will remain the same
between versions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-23 13:50:28 -07:00
Michael Crosby
4ecba2997e Merge pull request #1081 from crosbymichael/rebase-fix 
[ctr] fix tasks service reference
 2017-06-23 13:49:24 -07:00
Kenfe-Mickaël Laventure
40f2627ce1 Merge pull request #1008 from crosbymichael/kill-error 
Fix error on double Kill calls
 2017-06-23 13:48:49 -07:00
Michael Crosby
dff9efa5f3 [ctr] fix tasks service refernce 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 13:43:18 -07:00
Michael Crosby
8302ca4c62 Merge pull request #1057 from crosbymichael/embed 
Create server package for containerd daemon
 2017-06-23 13:37:48 -07:00
Michael Crosby
3b9d9dfa3e Fix error on doulbe Kill calls 
This returns a typed error for calls to Kill when the process has
already finished.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 13:28:48 -07:00
Michael Crosby
8d9ccd646b Merge pull request #935 from kunalkushwaha/ctr-fix-914 
Container list and Task List printed separately.
 2017-06-23 13:16:07 -07:00
Michael Crosby
c6a2f14674 Merge pull request #1080 from mlaventure/small-cleanup 
Simplify task.Wait() a bit
 2017-06-23 13:00:18 -07:00
Michael Crosby
003ad67375 Move platformInit and plugin load to server 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 12:06:31 -07:00
Kenfe-Mickael Laventure
79086a1873
Simplify task.Wait() a bit 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 12:05:24 -07:00
Kenfe-Mickaël Laventure
003ed58859 Merge pull request #1072 from stevvooe/move-events-to-services-pkg 
events: move types into service package
 2017-06-23 12:02:22 -07:00
Michael Crosby
3f45e4369e Add DeleteOpts for container deletion 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 11:57:29 -07:00
Michael Crosby
a33e8d034f Merge pull request #1078 from mlaventure/bubble-correct-runc-error 
shim: Use correct error when trying to expand runc error
 2017-06-23 11:43:59 -07:00
Kenfe-Mickael Laventure
0917269a9a
shim: Use correct error when trying to expand runc error 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 11:31:16 -07:00
Michael Crosby
bcb04540fa Merge pull request #1074 from stevvooe/whale-no-more 
Makefile: replace whale with D
 2017-06-23 11:08:27 -07:00
Michael Crosby
99160a7ac0 Merge pull request #854 from AkihiroSuda/lookup-mountinfo 
mountinfo: add Lookup for ease of implementing snapshotters
 2017-06-22 20:14:39 -07:00
Stephen J Day
e3f919f1d2
Makefile: replace whale with D 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-22 19:25:01 -07:00
Stephen J Day
c05be46348
events: move types into service package 
When using events, it was found to be fairly unwieldy with a number of
extra packages. For the most part, when interacting with the events
service, we want types of the same version of the service. This has been
accomplished by moving all events types into the events package.

In addition, several fixes to the way events are marshaled have been
included. Specifically, we defer to the protobuf type registration
system to assemble events and type urls, with a little bit sheen on top
of add a containerd.io oriented namespace.

This has resulted in much cleaner event consumption and has removed the
reliance on error prone type urls, in favor of concrete types.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-22 19:12:25 -07:00
Stephen Day
4c08911578 Merge pull request #1070 from stevvooe/namespaces-test-fixups 
namespaces: ensure that tests actually fail
 2017-06-22 16:15:33 -07:00
Stephen J Day
c6efdfb9ee
namespaces: ensure that tests actually fail 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-22 16:05:48 -07:00
Michael Crosby
a6e77432df Create server package for containerd daemon 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-22 13:08:19 -07:00
Phil Estes
c4da4ed393 Merge pull request #1049 from mlaventure/provide-error-when-task-not-found 
Update execution.getTask() to provide more fine grained error
 2017-06-22 15:18:53 -04:00
Kenfe-Mickael Laventure
40ce7665bd
Update execution.getTask() to provide more fine grained error 
This allow returning a more meaningful message when a request context
doesn't hold a namespace.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-22 07:53:40 -07:00
Kenfe-Mickaël Laventure
2fdb8020c4 Merge pull request #1062 from stevvooe/versioned-services 
*: version protobuf service packages
 2017-06-22 07:38:09 -07:00
Stephen J Day
12a6beaeeb
*: update import paths to use versioned services 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-21 18:29:06 -07:00
Stephen J Day
782d78346d
api/services: update go packages and regenerate 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-21 18:22:32 -07:00
Stephen J Day
4784c3962a
api/services: move services into version directories 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-21 18:17:27 -07:00
Phil Estes
76697ac8cb Merge pull request #1060 from samuelkarp/namespace-from-env 
namespaces: Export env var and default value
 2017-06-21 20:49:33 -04:00
Michael Crosby
98e17a2b97 Merge pull request #1059 from stevvooe/namespaces-charset 
namespaces: enforce a character set for namespaces
 2017-06-21 17:40:46 -07:00
Samuel Karp
9190f98e9c namespaces: Export env var and default value 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2017-06-21 17:38:07 -07:00
Stephen J Day
5380585e21
namespaces: enforce a character set for namespaces 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-21 17:31:25 -07:00
Michael Crosby
e588b30637 Merge pull request #1058 from dmcgowan/snapshot-command 
Update snapshot command in ctr
 2017-06-21 17:31:02 -07:00
Phil Estes
753f1a6c16 Merge pull request #1056 from samuelkarp/namespace-from-env 
namespaces: Add NamespaceFromEnv
 2017-06-21 20:25:55 -04:00
Michael Crosby
ab8311b494 Merge pull request #1053 from stevvooe/expand-container-runtime-bucket 
metadata: expand container runtime into bucket
 2017-06-21 17:22:26 -07:00
Derek McGowan
a3d5a818f6
Update snapshot command in ctr 
Move existing snapshot command to archive subcommand of snapshot.
Add list command for listing snapshots.
Add usage command for showing snapshot disk usage.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-21 17:18:52 -07:00
Michael Crosby
3c9c46e2e3 Merge pull request #1048 from estesp/err-cause-withstack-fixes 
Error handler cleanup
 2017-06-21 17:18:34 -07:00
Samuel Karp
879f092925 namespaces: Add NamespaceFromEnv 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2017-06-21 17:06:25 -07:00
Stephen Day
e7a06511aa Merge pull request #1047 from crosbymichael/rename-to-tasks 
Rename execution service to tasks
 2017-06-21 16:25:42 -07:00
Stephen J Day
ea44901921
metadata: expand container runtime into bucket 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-21 16:22:56 -07:00
Phil Estes
fb311ef2ec
Error handler cleanup 
Cleanup per additional comments in PR #992.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-06-21 15:47:23 -07:00