9b75807a0b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #622  from amouat/patch-2  
							
							... 
							
							
							
							Fix service command 
							
						 
						
							2015-06-11 15:27:43 -07:00  
				
					
						
							
							
								 
						
							
							
								01f730ad71 
								
							
								 
							
						 
						
							
							
								
								Document usage of htpasswd access controller  
							
							... 
							
							
							
							Signed-off-by: Stephen J Day <stephen.day@docker.com> 
							
						 
						
							2015-06-11 15:23:40 -07:00  
				
					
						
							
							
								 
						
							
							
								30d698926e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #621  from amouat/patch-1  
							
							... 
							
							
							
							Fix typo 
							
						 
						
							2015-06-11 15:17:53 -07:00  
				
					
						
							
							
								 
						
							
							
								a0baf93725 
								
							
								 
							
						 
						
							
							
								
								Fix service command  
							
							... 
							
							
							
							Pretty sure that service and docker were the wrong way around
Signed-off-by: Adrian Mouat <adrian.mouat@gmail.com> 
							
						 
						
							2015-06-11 22:36:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f670f00058 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							... 
							
							
							
							I think negociate is very occasionally used, but it certainly looks wrong to me.
Signed-off-by: Adrian Mouat <adrian.mouat@gmail.com> 
							
						 
						
							2015-06-11 21:45:26 +01:00  
				
					
						
							
							
								 
						
							
							
								6deedd29d9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #615  from allingeek/master  
							
							... 
							
							
							
							Adding a volume for the default 'registry-dev' location. 
							
						 
						
							2015-06-11 12:51:36 -07:00  
				
					
						
							
							
								 
						
							
							
								a5b21fa8f0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #617  from dmp42/pathchange  
							
							... 
							
							
							
							Saner default data location 
							
						 
						
							2015-06-11 11:42:24 -07:00  
				
					
						
							
							
								 
						
							
							
								ad23a43bc4 
								
							
								 
							
						 
						
							
							
								
								Enhance building doc to reflect the new data default location  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-11 11:08:16 -07:00  
				
					
						
							
							
								 
						
							
							
								fc796f1722 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #584  from xiekeyang/panic  
							
							... 
							
							
							
							Panic: Add Handler 
							
						 
						
							2015-06-11 11:01:43 -07:00  
				
					
						
							
							
								 
						
							
							
								1ad9ac497c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #590  from mattrobenolt/patch-1  
							
							... 
							
							
							
							Return valid json from StatusHandler 
							
						 
						
							2015-06-11 09:51:45 -07:00  
				
					
						
							
							
								 
						
							
							
								7729294e38 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #613  from antoniomercado/remove-nginx-authorization-unset  
							
							... 
							
							
							
							Removing Nginx Authorization header unset because it breaks with a user defined index endpoint 
							
						 
						
							2015-06-11 08:56:02 -07:00  
				
					
						
							
							
								 
						
							
							
								8ed0c66745 
								
							
								 
							
						 
						
							
							
								
								Enhancing doc to persist data  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-11 01:41:15 -07:00  
				
					
						
							
							
								 
						
							
							
								69b4b73f7c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #619  from neurodesign/fix-README-typo  
							
							... 
							
							
							
							Fix typo 
							
						 
						
							2015-06-11 01:01:19 -07:00  
				
					
						
							
							
								 
						
							
							
								25778270be 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							... 
							
							
							
							Signed-off-by: Julien Fernandez <julien.fernandez@gmail.com> 
							
						 
						
							2015-06-11 08:50:34 +02:00  
				
					
						
							
							
								 
						
							
							
								5bd4b5c558 
								
							
								 
							
						 
						
							
							
								
								Updating the location of the volume to match the new location of the default registry data location.  
							
							... 
							
							
							
							Signed-off-by: Jeff Nickoloff <jeff@allingeek.com> 
							
						 
						
							2015-06-10 21:24:16 -07:00  
				
					
						
							
							
								 
						
							
							
								6e0cfc17dc 
								
							
								 
							
						 
						
							
							
								
								Saner default data location  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-10 20:54:24 -07:00  
				
					
						
							
							
								 
						
							
							
								0f654c25ac 
								
							
								 
							
						 
						
							
							
								
								Rename the basic access controller to htpasswd  
							
							... 
							
							
							
							Signed-off-by: Stephen J Day <stephen.day@docker.com> 
							
						 
						
							2015-06-10 19:41:35 -07:00  
				
					
						
							
							
								 
						
							
							
								ffd3662982 
								
							
								 
							
						 
						
							
							
								
								Harden basic auth implementation  
							
							... 
							
							
							
							After consideration, the basic authentication implementation has been
simplified to only support bcrypt entries in an htpasswd file. This greatly
increases the security of the implementation by reducing the possibility of
timing attacks and other problems trying to detect the password hash type.
Also, the htpasswd file is only parsed at startup, ensuring that the file can
be edited and not effect ongoing requests. Newly added passwords take effect on
restart. Subsequently, password hash entries are now stored in a map.
Test cases have been modified accordingly.
Signed-off-by: Stephen J Day <stephen.day@docker.com> 
							
						 
						
							2015-06-10 19:38:56 -07:00  
				
					
						
							
							
								 
						
							
							
								ffe56ebe41 
								
							
								 
							
						 
						
							
							
								
								Refactor Basic Authentication package  
							
							... 
							
							
							
							This change refactors the basic authentication implementation to better follow
Go coding standards. Many types are no longer exported. The parser is now a
separate function from the authentication code. The standard functions
(*http.Request).BasicAuth/SetBasicAuth are now used where appropriate.
Signed-off-by: Stephen J Day <stephen.day@docker.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								abd142855a 
								
							
								 
							
						 
						
							
							
								
								Unexported function to comply with golint  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								e4c3ab4377 
								
							
								 
							
						 
						
							
							
								
								Removed dashes from comments, unexported htpasswd struct  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								d4f2260e04 
								
							
								 
							
						 
						
							
							
								
								Added dependency to golang.org/x/crypto/bcrypt  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								04f6a4811d 
								
							
								 
							
						 
						
							
							
								
								Fixed golint, gofmt warning advice.  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								c50dfb7dae 
								
							
								 
							
						 
						
							
							
								
								Added support for bcrypt, plaintext; extension points for other htpasswd hash methods.  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								c4849bb99a 
								
							
								 
							
						 
						
							
							
								
								Aligned formatting with gofmt  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								0ecaa7f40a 
								
							
								 
							
						 
						
							
							
								
								Fixed WWW-Authenticate: header, added example config and import into main, fixed golint warnings  
							
							... 
							
							
							
							Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:38 -07:00  
				
					
						
							
							
								 
						
							
							
								8a204f59e7 
								
							
								 
							
						 
						
							
							
								
								Implementation of a basic authentication scheme using standard .htpasswd files  
							
							... 
							
							
							
							Signed-off-by: BadZen <dave.trombley@gmail.com>
Signed-off-by: Dave Trombley <dave.trombley@gmail.com> 
							
						 
						
							2015-06-10 19:06:37 -07:00  
				
					
						
							
							
								 
						
							
							
								7363323321 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #612  from HuKeping/addtest-httpchecker  
							
							... 
							
							
							
							Test: add test for HTTPChecker 
							
						 
						
							2015-06-10 17:08:55 -07:00  
				
					
						
							
							
								 
						
							
							
								bf305c1b91 
								
							
								 
							
						 
						
							
							
								
								Adding a volume for the default 'registry-dev' location.  
							
							... 
							
							
							
							Signed-off-by: Jeff Nickoloff <jeff@allingeek.com> 
							
						 
						
							2015-06-10 10:25:41 -07:00  
				
					
						
							
							
								 
						
							
							
								b450b42c25 
								
							
								 
							
						 
						
							
							
								
								Removing Nginx Authorization header unset because it breaks with a user defined index endpoint  
							
							... 
							
							
							
							Signed-off-by: Antonio Mercado <amercado@thinknode.com> 
							
						 
						
							2015-06-10 09:44:43 -04:00  
				
					
						
							
							
								 
						
							
							
								b230183b0f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #553  from dmp42/docs-rework  
							
							... 
							
							
							
							Docs rework 
							
						 
						
							2015-06-09 14:48:39 -07:00  
				
					
						
							
							
								 
						
							
							
								5d5caa0e9a 
								
							
								 
							
						 
						
							
							
								
								Test: add test for HTTPChecker  
							
							... 
							
							
							
							Signed-off-by: Hu Keping <hukeping@huawei.com> 
							
						 
						
							2015-06-10 01:39:34 +08:00  
				
					
						
							
							
								 
						
							
							
								b684b77a0c 
								
							
								 
							
						 
						
							
							
								
								Return valid json from StatusHandler  
							
							... 
							
							
							
							Signed-off-by: Matt Robenolt <matt@ydekproductions.com> 
							
						 
						
							2015-06-08 23:31:03 -07:00  
				
					
						
							
							
								 
						
							
							
								f63313de1f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #599  from stevvooe/clarify-deletion-by-digest-constraint  
							
							... 
							
							
							
							Clarify digest in API specification 
							
						 
						
							2015-06-08 19:04:53 -07:00  
				
					
						
							
							
								 
						
							
							
								7e6b4e8c52 
								
							
								 
							
						 
						
							
							
								
								Add description of digests to API specification  
							
							... 
							
							
							
							Signed-off-by: Stephen J Day <stephen.day@docker.com> 
							
						 
						
							2015-06-08 19:04:13 -07:00  
				
					
						
							
							
								 
						
							
							
								25bd3fc777 
								
							
								 
							
						 
						
							
							
								
								Link to compose  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:57:06 -07:00  
				
					
						
							
							
								 
						
							
							
								b8d785c79e 
								
							
								 
							
						 
						
							
							
								
								Use bcrypt  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:57:06 -07:00  
				
					
						
							
							
								 
						
							
							
								81e8657d7b 
								
							
								 
							
						 
						
							
							
								
								Fix here doc conf generation  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:57:05 -07:00  
				
					
						
							
							
								 
						
							
							
								8c1784c838 
								
							
								 
							
						 
						
							
							
								
								Keeping in synch  
							
							... 
							
							
							
							- commenting out both the "JSON" and "token" specs, unless someone thinks they should be here
- added help, glossary, introduction and authentication documents
Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:57:05 -07:00  
				
					
						
							
							
								 
						
							
							
								96d79eb30e 
								
							
								 
							
						 
						
							
							
								
								Adding authentication  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:57:05 -07:00  
				
					
						
							
							
								 
						
							
							
								74873aed14 
								
							
								 
							
						 
						
							
							
								
								Removing internal information  
							
							... 
							
							
							
							Removed content has been ported to the wiki
Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:57:05 -07:00  
				
					
						
							
							
								 
						
							
							
								c1c638d01f 
								
							
								 
							
						 
						
							
							
								
								Minor keyword add  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:52 -07:00  
				
					
						
							
							
								 
						
							
							
								c405f3717a 
								
							
								 
							
						 
						
							
							
								
								Minor fixes  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:52 -07:00  
				
					
						
							
							
								 
						
							
							
								56ff32c683 
								
							
								 
							
						 
						
							
							
								
								Revising glossary  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:52 -07:00  
				
					
						
							
							
								 
						
							
							
								10ba376a99 
								
							
								 
							
						 
						
							
							
								
								Minor cleanup in the index  
							
							... 
							
							
							
							- adding glossary
- removing empty "advanced"
- commenting out building and architecture for now
- minor text enhancements
Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:51 -07:00  
				
					
						
							
							
								 
						
							
							
								c3b3802503 
								
							
								 
							
						 
						
							
							
								
								Small fixes  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:51 -07:00  
				
					
						
							
							
								 
						
							
							
								b7b8e64f1d 
								
							
								 
							
						 
						
							
							
								
								Moved instructions up  
							
							... 
							
							
							
							Make it more obvious that environment variables is the way to go.
Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:51 -07:00  
				
					
						
							
							
								 
						
							
							
								26d87ed1a5 
								
							
								 
							
						 
						
							
							
								
								No reason to detail here  
							
							... 
							
							
							
							Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:51 -07:00  
				
					
						
							
							
								 
						
							
							
								431e829fa5 
								
							
								 
							
						 
						
							
							
								
								Simplified index  
							
							... 
							
							
							
							Simplified index again, to make access to information more obvious and more direct.
Added a TLDR for people in a hurry.
Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:51 -07:00  
				
					
						
							
							
								 
						
							
							
								d9dfe54308 
								
							
								 
							
						 
						
							
							
								
								Separated "help"  
							
							... 
							
							
							
							Help page is separate now.
Removed the bulk of it from various pages.
Signed-off-by: Olivier Gambier <olivier@docker.com> 
							
						 
						
							2015-06-08 15:55:51 -07:00