mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Update email + add self to pkg/signal
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
This commit is contained in:
		
							parent
							
								
									037f942a0b
								
							
						
					
					
						commit
						915d967f55
					
				
					 9 changed files with 10 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
Solomon Hykes <solomon@dotcloud.com> (@shykes)
 | 
			
		||||
Guillaume Charmes <guillaume@dotcloud.com> (@creack)
 | 
			
		||||
Guillaume J. Charmes <guillaume@docker.com> (@creack)
 | 
			
		||||
Victor Vieux <vieux@docker.com> (@vieux)
 | 
			
		||||
Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 | 
			
		||||
.travis.yml: Tianon Gravi <admwiggin@gmail.com> (@tianon)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@
 | 
			
		|||
#
 | 
			
		||||
 | 
			
		||||
FROM		ubuntu:12.10
 | 
			
		||||
MAINTAINER	Guillaume J. Charmes <guillaume@dotcloud.com>
 | 
			
		||||
MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
 | 
			
		||||
 | 
			
		||||
RUN		apt-get update && apt-get install -y wget git mercurial
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
FROM		busybox
 | 
			
		||||
MAINTAINER	Guillaume J. Charmes <guillaume@dotcloud.com>
 | 
			
		||||
MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
 | 
			
		||||
ADD		manager	  /usr/bin/
 | 
			
		||||
ENTRYPOINT	["/usr/bin/manager"]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -481,7 +481,7 @@ For example you might add something like this:
 | 
			
		|||
    # VERSION               0.0.1
 | 
			
		||||
 | 
			
		||||
    FROM      ubuntu
 | 
			
		||||
    MAINTAINER Guillaume J. Charmes <guillaume@dotcloud.com>
 | 
			
		||||
    MAINTAINER Guillaume J. Charmes <guillaume@docker.com>
 | 
			
		||||
 | 
			
		||||
    # make sure the package repository is up to date
 | 
			
		||||
    RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,2 +1,2 @@
 | 
			
		|||
Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 | 
			
		||||
Guillaume Charmes <guillaume@dotcloud.com> (@creack)
 | 
			
		||||
Guillaume J. Charmes <guillaume@docker.com> (@creack)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,2 +1,2 @@
 | 
			
		|||
Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 | 
			
		||||
Guillaume Charmes <guillaume@dotcloud.com> (@creack)
 | 
			
		||||
Guillaume J. Charmes <guillaume@docker.com> (@creack)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,2 +1,2 @@
 | 
			
		|||
Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 | 
			
		||||
Guillaume Charmes <guillaume@dotcloud.com> (@creack)
 | 
			
		||||
Guillaume J. Charmes <guillaume@docker.com> (@creack)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								pkg/signal/MAINTAINERS
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								pkg/signal/MAINTAINERS
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
Guillaume J. Charmes <guillaume@docker.com> (@creack)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1,2 +1,2 @@
 | 
			
		|||
Guillaume Charmes <guillaume@dotcloud.com> (@creack)
 | 
			
		||||
Guillaume J. Charmes <guillaume@docker.com> (@creack)
 | 
			
		||||
Solomon Hykes <solomon@dotcloud.com> (@shykes)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue