Stephen Day 
							
						 
					 
					
						
						
							
						
						23a644de8a 
					 
					
						
						
							
							Merge pull request  #390  from estesp/init-vendoring  
						
						... 
						
						
						
						Add vendoring to containerd master 
						
						
					 
					
						2017-01-11 14:16:57 -08:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						f867156a38 
					 
					
						
						
							
							Update protoc generation to use vendored protos  
						
						... 
						
						
						
						Use vendored-in protos in the project path rather
than expecting developers to have them in a local
path on the host. This made a generated change
in the FileDescriptor content, but everything else
matches and binaries are building properly.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > 
						
						
					 
					
						2017-01-11 16:59:20 -05:00 
						 
				 
			
				
					
						
							
							
								Davanum Srinivas 
							
						 
					 
					
						
						
							
						
						4f8a784b41 
					 
					
						
						
							
							Indent proto files with tabs only  
						
						... 
						
						
						
						fix "make fmt" failure by switching from spaces to tabs
Signed-Off-By: Davanum Srinivas <davanum@gmail.com > 
						
						
					 
					
						2016-12-16 17:20:41 -05:00 
						 
				 
			
				
					
						
							
							
								Antonio Murdaca 
							
						 
					 
					
						
						
							
						
						a5fa2c5536 
					 
					
						
						
							
							api/shim: fix indent  
						
						... 
						
						
						
						Signed-off-by: Antonio Murdaca <runcom@redhat.com > 
						
						
					 
					
						2016-12-15 10:33:03 +01:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						2ef399b315 
					 
					
						
						
							
							Add event support to execution subsystem  
						
						... 
						
						
						
						The implementation relies on nats.io
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-12 09:21:29 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						2bee4ac5cd 
					 
					
						
						
							
							Only use IDs for execution RPC requests  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-09 11:32:45 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						642ed8bb48 
					 
					
						
						
							
							Add shim proto  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-12-09 10:13:57 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						0aad42f5cf 
					 
					
						
						
							
							Add exec and terminal support  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-09 10:00:34 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						5a86eae247 
					 
					
						
						
							
							Merge execution and container service  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-07 19:44:22 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						723a72bdf8 
					 
					
						
						
							
							Fix execution build  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-12-05 16:18:05 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						21a53c1d70 
					 
					
						
						
							
							Add container start and supervisor  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-12-05 16:18:05 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						c857213b4c 
					 
					
						
						
							
							move work on execution service  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-05 14:15:03 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						d9a2f40463 
					 
					
						
						
							
							api/execution: use Empty well-known type  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2016-12-02 16:04:13 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						32bf0f69fd 
					 
					
						
						
							
							Start work on Container and Process model  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-12-02 15:37:16 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						6641888667 
					 
					
						
						
							
							Start work on execution server implementation  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-12-02 11:33:58 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						d0e2f3778a 
					 
					
						
						
							
							Update execution and container services  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-12-02 10:28:16 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						f898628330 
					 
					
						
						
							
							api/mount: add common mount type for services  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2016-12-01 15:27:52 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						ef03000b27 
					 
					
						
						
							
							Revert "proto: move all protos under a single root"  
						
						... 
						
						
						
						This reverts commit 352c6b590c 
						
						
					 
					
						2016-12-01 14:25:03 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						352c6b590c 
					 
					
						
						
							
							proto: move all protos under a single root  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-01 14:17:13 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						4cf40db861 
					 
					
						
						
							
							proto: rename container service to execution  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-01 13:57:51 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						62ca43566e 
					 
					
						
						
							
							proto: rename container to execution  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-01 13:38:29 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						8a36e1c6d1 
					 
					
						
						
							
							api: use correct generation helper  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2016-12-01 13:31:57 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						9f90fdbf07 
					 
					
						
						
							
							api: generate protobufs using go generate  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2016-12-01 12:36:19 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						4d1a30ff41 
					 
					
						
						
							
							api: protos now pass lint checks  
						
						... 
						
						
						
						Generation is likely broken, but the Makefile linter now passes. Another
pass will have a fully working toolchain.
Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2016-12-01 12:22:05 -08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						6c7b4b4c17 
					 
					
						
						
							
							proto: make container.proto compile  
						
						... 
						
						
						
						Replaced tags with owner. This assumes we will provide a Metadata
endpoint since we're planning on using it for distribution.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-12-01 10:28:38 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						3ef3f74878 
					 
					
						
						
							
							Add ctr run functions for mocking client  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-11-29 16:52:04 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						0806a0d8db 
					 
					
						
						
							
							Update container protos  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-11-29 15:36:25 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						fc577a1cbb 
					 
					
						
						
							
							Add protos for initial API  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-11-28 15:28:38 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						e115b52ce2 
					 
					
						
						
							
							Remove containerd files  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-11-07 13:10:09 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						b6bf350a07 
					 
					
						
						
							
							Merge container.protos  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-09-22 11:29:20 -07:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						32a25d5523 
					 
					
						
						
							
							api: begin to define the containerkit api  
						
						... 
						
						
						
						This commit cuts out the structure for defining grpc services for this
project. To provide compatibility with go package generation and support
reuse, we use a single protobuf file per package and make the import
paths relative to the GOPATH.
This first pass attempts to position the Mount type as the lingua franca
of ContainerKit. The Images service will provide paths prepared for use
as a set of mounts of the container service.
We'll need to merge the container service in place with new file defined
here.
Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2016-09-20 20:22:23 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						0dcd3a034d 
					 
					
						
						
							
							Add additional request/response protos  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-09-20 12:01:28 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						ce7702f2db 
					 
					
						
						
							
							Add initial container protos and service  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-09-20 11:20:48 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						97dbfe9e1f 
					 
					
						
						
							
							Move cputicks into osutils package  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-09-20 11:20:17 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						435a1c825d 
					 
					
						
						
							
							Refactor api/http to just pprof  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-09-20 10:22:19 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Danese 
							
						 
					 
					
						
						
							
						
						3492af35ba 
					 
					
						
						
							
							grpc: regenerate protos and adjust for new package API  
						
						... 
						
						
						
						Signed-off-by: Mike Danese <mikedanese@google.com > 
						
						
					 
					
						2016-09-12 11:37:24 -07:00 
						 
				 
			
				
					
						
							
							
								Yu, Zou 
							
						 
					 
					
						
						
							
						
						79c7673858 
					 
					
						
						
							
							add more blkio subsystem parameters to control according to ones provided by runc. ( #304 )  
						
						... 
						
						
						
						Signed-off-by: Yu Zou <zouyu7@huawei.com > 
						
						
					 
					
						2016-08-26 11:07:45 -07:00 
						 
				 
			
				
					
						
							
							
								Harry Zhang 
							
						 
					 
					
						
						
							
						
						9df37c23e4 
					 
					
						
						
							
							Fix wrong field name  
						
						... 
						
						
						
						Signed-off-by: Harry Zhang <harryz@hyper.sh > 
						
						
					 
					
						2016-07-14 17:06:01 +08:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						90f827ca10 
					 
					
						
						
							
							Streamline events ( #287 )  
						
						... 
						
						
						
						* Sync process.State() with the matching events
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
* Allow requesting events for a specific container
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
* Sync container state retrieval with other events
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
* Let containerd take care of calling runtime delete on exit
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
* Take care of possible race in TestBusyboxTopExecTopKillInit
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-07-13 11:01:07 -07:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickael Laventure 
							
						 
					 
					
						
						
							
						
						dfb626dccc 
					 
					
						
						
							
							Use protobuf Timestamp type instead of uint64  
						
						... 
						
						
						
						This will ensure nanoseconds are taken in account.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-07-01 09:37:21 -07:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						098f9f1a1b 
					 
					
						
						
							
							Use uin64 for UpdateResource rpc ( #265 )  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-06-13 10:59:12 -07:00 
						 
				 
			
				
					
						
							
							
								boucher 
							
						 
					 
					
						
						
							
						
						a135e1093d 
					 
					
						
						
							
							Support the new --empty-ns flags in RunC for checkpoint/restore.  
						
						... 
						
						
						
						Signed-off-by: Ross Boucher <rboucher@gmail.com > 
						
						
					 
					
						2016-06-09 16:49:26 -04:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						16a8dfe6a8 
					 
					
						
						
							
							Add support for updating Kernel Memory Limits ( #256 )  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-06-06 11:26:07 -07:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						5624732128 
					 
					
						
						
							
							Add golint to test ( #255 )  
						
						... 
						
						
						
						* Add a new lint rule to the Makefile
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
* Fix linter errors
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
* Allow replacing the default apt mirror
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-06-03 15:00:49 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						7fa8fc1477 
					 
					
						
						
							
							Regen proto for checkpoint pr ( #249 )  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-05-25 17:52:46 -07:00 
						 
				 
			
				
					
						
							
							
								Ross Boucher 
							
						 
					 
					
						
						
							
						
						e756ae42d1 
					 
					
						
						
							
							Add support for specifying a checkpoint directory. ( #245 )  
						
						... 
						
						
						
						Signed-off-by: Ross Boucher <rboucher@gmail.com > 
						
						
					 
					
						2016-05-25 17:42:37 -07:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						126e5c403e 
					 
					
						
						
							
							Allow specifying runtime to be used when creating container ( #247 )  
						
						... 
						
						
						
						Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com > 
						
						
					 
					
						2016-05-23 15:43:47 -07:00 
						 
				 
			
				
					
						
							
							
								Amit Krishnan 
							
						 
					 
					
						
						
							
						
						62e1370f91 
					 
					
						
						
							
							containerd build clean on Solaris ( #203 )  
						
						... 
						
						
						
						* containerd build clean on Solaris
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
* Vendor golang.org/x/sys
Signed-off-by: Amit Krishnan <krish.amit@gmail.com > 
						
						
					 
					
						2016-05-19 10:12:50 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						614df93b92 
					 
					
						
						
							
							Update grpc and protobufs dep ( #243 )  
						
						... 
						
						
						
						* Update grpc and protobufs dep
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
* Fix grpc error check
Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2016-05-18 09:16:55 -07:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						57b7c3da91 
					 
					
						
						
							
							Merge pull request  #237  from crosbymichael/create-status  
						
						... 
						
						
						
						Use state for container create 
						
						
					 
					
						2016-05-09 14:55:08 -07:00