yanxuean 
							
						 
					 
					
						
						
							
						
						b4ebf2d7a7 
					 
					
						
						
							
							improve localResolve  
						
						 
						
						... 
						
						
						
						Signed-off-by: yanxuean <yan.xuean@zte.com.cn > 
						
						
					 
					
						2017-11-23 10:56:12 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhi 
							
						 
					 
					
						
						
							
						
						cd5886d647 
					 
					
						
						
							
							Adding kube pod and container labels to containerd  
						
						 
						
						... 
						
						
						
						Currently we have the pod and container labels part of
containerd metadata extensions. However for third party users
like cadvisor that depend on standard kube labels will need
to be aware of the way metadata is stored in containerd to
fetch the labels.
Signed-off-by: abhi <abhi@docker.com > 
						
						
					 
					
						2017-11-07 22:19:19 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						25fdf72692 
					 
					
						
						
							
							Add image load.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-10-27 21:51:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yanqiang Miao 
							
						 
					 
					
						
						
							
						
						c65921b16a 
					 
					
						
						
							
							Get the mountInfo by 'LookupMount' in containerd  
						
						 
						
						... 
						
						
						
						Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn > 
						
						
					 
					
						2017-10-12 11:09:24 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						d8a3c6b018 
					 
					
						
						
							
							adds support for configuring the containerd runtime engine  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2017-09-26 20:22:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						cd57d063c5 
					 
					
						
						
							
							Add systemd cgroup support.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-09-26 06:44:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						10df5f71a7 
					 
					
						
						
							
							Merge pull request  #212  from miaoyq/related-selinux  
						
						 
						
						... 
						
						
						
						Add build tags and Improve the test case of selinux 
						
						
					 
					
						2017-09-21 21:07:53 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yanqiang Miao 
							
						 
					 
					
						
						
							
						
						7096027d21 
					 
					
						
						
							
							Add build tags and Improve the test case of selinux  
						
						 
						
						... 
						
						
						
						- Add build tags
- Fixes a bug because of my negligence
- Improve the test case of selinux
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
test 
						
						
					 
					
						2017-09-22 11:39:32 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						cc1b0b6709 
					 
					
						
						
							
							Add restart recovery logic.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-09-21 17:59:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yanxuean 
							
						 
					 
					
						
						
							
						
						e1a7a0ea76 
					 
					
						
						
							
							Switch to containerd extension  
						
						 
						
						... 
						
						
						
						fix  #251 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn > 
						
						
					 
					
						2017-09-21 00:15:10 +08: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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jamie Zhuang 
							
						 
					 
					
						
						
							
						
						915f5b0aea 
					 
					
						
						
							
							Make sandbox container image configurable  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jamie Zhuang <lanchongyizu@gmail.com > 
						
						
					 
					
						2017-09-03 02:53:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yanqiang Miao 
							
						 
					 
					
						
						
							
						
						0c3304e006 
					 
					
						
						
							
							Support selinux options/label  
						
						 
						
						... 
						
						
						
						Support selinux optios/label
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn > 
						
						
					 
					
						2017-08-31 19:20:12 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						ac4f238f48 
					 
					
						
						
							
							Cleanup image operations.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-31 00:52:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prativadi 
							
						 
					 
					
						
						
							
						
						e1edeae4c9 
					 
					
						
						
							
							Adding option to configure cgroup to start cri-containerd  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prativadi <abhi@docker.com > 
						
						
					 
					
						2017-08-30 14:37:40 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						f46cd1a71a 
					 
					
						
						
							
							Disable pid namespace sharing  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-28 05:44:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						45ee2e554a 
					 
					
						
						
							
							Add container attach support.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-23 23:48:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						77b703f1e7 
					 
					
						
						
							
							Move generateID to util.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-23 23:46:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yanxuean 
							
						 
					 
					
						
						
							
						
						d2757cb8f9 
					 
					
						
						
							
							Checkpoint and restart recovery  
						
						 
						
						... 
						
						
						
						fix part of #120 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn > 
						
						
					 
					
						2017-08-23 17:01:13 +08: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						4c5cea9258 
					 
					
						
						
							
							Handle device symlink.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-08 00:53:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						8b56c91ec5 
					 
					
						
						
							
							Extract execInContainer  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-08-07 22:35:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						73748840da 
					 
					
						
						
							
							Swicth to 1.0.0-alpha2 containerd api.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2017-08-02 23:21:37 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						7b16a35287 
					 
					
						
						
							
							Use new metadata store.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-07-28 23:35:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						4317e6119a 
					 
					
						
						
							
							Remove sandbox truncindex.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-07-28 23:35:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						054bcfbf68 
					 
					
						
						
							
							Merge pull request  #91  from Random-Liu/support-oom-event  
						
						 
						
						... 
						
						
						
						Handle OOM event. 
						
						
					 
					
						2017-06-26 00:18:27 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						a2f6f7f128 
					 
					
						
						
							
							Handle OOM event.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-26 07:10:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						14fd8401a2 
					 
					
						
						
							
							Set sandbox container resource limit.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-23 01:23:53 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						1bf09089b3 
					 
					
						
						
							
							Register all possible repo tags and repo digests.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-21 20:20:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						862d00a21c 
					 
					
						
						
							
							Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-21 01:56:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						0321bef16a 
					 
					
						
						
							
							Use gcr.io/google_containers/pause:3.0 because we've supported schema 1.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-20 21:59:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						9b79201aa5 
					 
					
						
						
							
							Add ExecSync.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-16 22:28:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						cb9e104cf1 
					 
					
						
						
							
							Create/delete containerd containerd  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-16 16:43:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						6ca9c65578 
					 
					
						
						
							
							Rename more container to task.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-16 02:34:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						484a326717 
					 
					
						
						
							
							modify code to compile on updated containerd  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2017-06-15 23:14:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						bd09d31777 
					 
					
						
						
							
							Fix Delete race.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-14 01:36:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						9d5990fe4f 
					 
					
						
						
							
							Add sandbox /dev/shm.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-11 09:49:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Crazykev 
							
						 
					 
					
						
						
							
						
						9bf7ffd51a 
					 
					
						
						
							
							generate and maintain resolv.conf for sandbox  
						
						 
						
						... 
						
						
						
						Signed-off-by: Crazykev <crazykev@zju.edu.cn > 
						
						
					 
					
						2017-06-09 19:36:30 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						88f4c252d6 
					 
					
						
						
							
							Add sandbox /etc/hosts when using host network  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-06-06 06:43:38 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						eb20601c08 
					 
					
						
						
							
							Pull sandbox image and apply image config  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-31 00:39:38 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Random-Liu 
							
						 
					 
					
						
						
							
						
						bc7dfa2650 
					 
					
						
						
							
							Update containerd version to  193abed96e.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Random-Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-27 00:07:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Random-Liu 
							
						 
					 
					
						
						
							
						
						b112418e7b 
					 
					
						
						
							
							Finish image management.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Random-Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-26 23:52:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Crazykev 
							
						 
					 
					
						
						
							
						
						49e7ef2153 
					 
					
						
						
							
							update kubernetes vendor for new CRI change  
						
						 
						
						... 
						
						
						
						Signed-off-by: Crazykev <crazykev@zju.edu.cn > 
						
						
					 
					
						2017-05-24 10:25:55 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Random-Liu 
							
						 
					 
					
						
						
							
						
						6ac71e5862 
					 
					
						
						
							
							Add initial container implementation.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-22 19:14:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						2d2fcedf24 
					 
					
						
						
							
							Return not exist error in metadata store  
						
						 
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-16 19:57:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Random-Liu 
							
						 
					 
					
						
						
							
						
						bf28c7fc75 
					 
					
						
						
							
							Add initial sandbox management implementation  
						
						 
						
						... 
						
						
						
						Signed-off-by: Random-Liu <lantaol@google.com > 
						
						
					 
					
						2017-05-12 13:14:11 -07:00