Jason Wilder 
							
						 
					 
					
						
						
							
						
						d40d1d4052 
					 
					
						
						
							
							Update to docker-gen 0.7.1  
						
						 
						
						
						
						
					 
					
						2016-05-04 14:51:30 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason Wilder 
							
						 
					 
					
						
						
							
						
						5b9264d945 
					 
					
						
						
							
							Merge pull request  #298  from kamermans/master  
						
						 
						
						... 
						
						
						
						Added env var to disable SSL redirect 
						
						
					 
					
						2016-05-01 17:45:45 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						786a2375aa 
					 
					
						
						
							
							Using different path method to hopefully fix cert volume issue in CI systems  
						
						 
						
						
						
						
					 
					
						2016-04-20 12:47:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						f296b273ce 
					 
					
						
						
							
							Normalized indentation, added explicit CERT_NAME  
						
						 
						
						
						
						
					 
					
						2016-04-20 12:33:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						1d0a5d9194 
					 
					
						
						
							
							Added SSL/HTTPS tests  
						
						 
						
						
						
						
					 
					
						2016-04-20 12:20:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Baptiste Donaux 
							
						 
					 
					
						
						
							
						
						6928d62e1e 
					 
					
						
						
							
							Upgrade Docker dependency from 1.9 to 1.10  
						
						 
						
						
						
						
					 
					
						2016-03-24 14:40:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Baptiste Donaux 
							
						 
					 
					
						
						
							
						
						88cc096aaf 
					 
					
						
						
							
							[FIX] expose port for separated containers test  
						
						 
						
						
						
						
					 
					
						2016-03-24 11:16:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Baptiste Donaux 
							
						 
					 
					
						
						
							
						
						6b88365465 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
						
					 
					
						2016-03-24 08:41:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pit Kleyersburg 
							
						 
					 
					
						
						
							
						
						86aea653c8 
					 
					
						
						
							
							Update to docker-gen 0.7.0  
						
						 
						
						... 
						
						
						
						Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).
This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.
Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.
The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.
[1]: 50435652b1 
						
						
					 
					
						2016-03-23 17:45:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Baptiste Donaux 
							
						 
					 
					
						
						
							
						
						b42cd85570 
					 
					
						
						
							
							Unit test - removed network creation  
						
						 
						
						
						
						
					 
					
						2016-02-26 09:12:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Baptiste Donaux 
							
						 
					 
					
						
						
							
						
						2b418319f2 
					 
					
						
						
							
							Test to support overlay networks  
						
						 
						
						
						
						
					 
					
						2016-02-25 09:58:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas LEVEIL 
							
						 
					 
					
						
						
							
						
						c11af183d8 
					 
					
						
						
							
							CircleCI: make tests run on Docker 1.9.1  
						
						 
						
						... 
						
						
						
						See CircleCI announcement https://discuss.circleci.com/t/docker-1-9-1-is-available/1009  
						
						
					 
					
						2015-12-14 09:25:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						098b058b0d 
					 
					
						
						
							
							Trap TERM to allow quicker exit of web containers  
						
						 
						
						
						
						
					 
					
						2015-10-12 21:53:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						1d9db94535 
					 
					
						
						
							
							Use docker:1.7 image to match CircleCI's version  
						
						 
						
						
						
						
					 
					
						2015-10-12 21:16:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						5c6a63568d 
					 
					
						
						
							
							Remove --rm from docker run commands  
						
						 
						
						... 
						
						
						
						Trying to avoid "Failed to destroy btrfs snapshot" errors on CircleCI 
						
						
					 
					
						2015-10-12 20:59:53 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						6e7ff3451b 
					 
					
						
						
							
							Remove commented out line  
						
						 
						
						
						
						
					 
					
						2015-10-11 11:27:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						30e565f0ed 
					 
					
						
						
							
							Check "docker version" from a sibling container  
						
						 
						
						
						
						
					 
					
						2015-10-11 11:04:00 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						b1a08843da 
					 
					
						
						
							
							Avoid breakage from IFS being reset in "run"  
						
						 
						
						... 
						
						
						
						See https://github.com/sstephenson/bats/issues/89  
						
						
					 
					
						2015-10-11 10:55:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						0d2bc38179 
					 
					
						
						
							
							Run curl commands from a sibling container  
						
						 
						
						
						
						
					 
					
						2015-10-09 23:11:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						2cba8a8d5f 
					 
					
						
						
							
							Avoid xargs -r  
						
						 
						
						... 
						
						
						
						The -r option is not available on OS X 
						
						
					 
					
						2015-10-09 23:10:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Dillon 
							
						 
					 
					
						
						
							
						
						5fe9411d88 
					 
					
						
						
							
							Change line endings to Unix  
						
						 
						
						
						
						
					 
					
						2015-10-09 23:07:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas LEVEIL 
							
						 
					 
					
						
						
							
						
						92be4b6d54 
					 
					
						
						
							
							doc  
						
						 
						
						
						
						
					 
					
						2015-09-30 23:57:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas LEVEIL 
							
						 
					 
					
						
						
							
						
						865b14e029 
					 
					
						
						
							
							tests: fix minor bug in docker_wait_for_log  
						
						 
						
						
						
						
					 
					
						2015-09-30 23:56:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas LEVEIL 
							
						 
					 
					
						
						
							
						
						b4d1acbf2d 
					 
					
						
						
							
							tests: refactoring  
						
						 
						
						
						
						
					 
					
						2015-09-30 23:40:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas LEVEIL 
							
						 
					 
					
						
						
							
						
						4bd30f5d2c 
					 
					
						
						
							
							add test suite. See  #197  
						
						 
						
						... 
						
						
						
						This test suite is implemented using [bats](https://github.com/sstephenson/bats ).
Not all features are tested. For instance ssl features and custom nginx config are missing. Probably others.
This test suite won't work with TravisCI. Too many evenings were wasted trying to overcome [issues](http://stackoverflow.com/questions/32846800/travis-fails-to-stop-docker-containers ) that arises only on the TravisCI platform. However it runs on [CircleCI](https://circleci.com ) which is also free for opensource projects. 
						
						
					 
					
						2015-09-29 23:46:36 +00:00