Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								3ef6b17bfc 
								
							 
						 
						
							
							
								
								Use docker-py 1.8.0  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-04-06 13:28:45 -07:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								1a7a65f84d 
								
							 
						 
						
							
							
								
								Include docker-py requirements fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-03-31 18:01:51 -07:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								d27b82207c 
								
							 
						 
						
							
							
								
								Remove obsolete assert_hostname tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-03-30 10:58:15 -07:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								71c86acaa4 
								
							 
						 
						
							
							
								
								Update docker-py version to include match_hostname fix  
							
							 
							
							... 
							
							
							
							Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-03-29 18:01:27 -07:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								60470fb9f1 
								
							 
						 
						
							
							
								
								Require docker-py 1.8.0rc2  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-03-24 10:13:56 -07:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								4727115317 
								
							 
						 
						
							
							
								
								Bump docker-py version to include tcp host fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-03-22 11:47:53 -07:00  
						
					 
				
					
						
							
							
								 
								Philip Walls
							
						 
						
							 
							
							
							
							
								
							
							
								85c7d3e5ce 
								
							 
						 
						
							
							
								
								Add support for docker run --tmpfs flag.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Philip Walls <pawalls@rabidgeek.com> 
							
						 
						
							2016-03-18 18:19:48 -04:00  
						
					 
				
					
						
							
							
								 
								Matt Daue
							
						 
						
							 
							
							
							
							
								
							
							
								ee136446a2 
								
							 
						 
						
							
							
								
								Fix   #2804 : Add ipv4 and ipv6 static addressing  
							
							 
							
							... 
							
							
							
							- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests
Signed-off-by: Matt Daue <mattdaue@gmail.com> 
							
						 
						
							2016-03-09 18:37:52 -05:00  
						
					 
				
					
						
							
							
								 
								Stéphane Seguin
							
						 
						
							 
							
							
							
							
								
							
							
								82632098a3 
								
							 
						 
						
							
							
								
								Add -f, --follow flag as option on logs.  
							
							 
							
							... 
							
							
							
							Closes  #2187 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com> 
							
						 
						
							2016-03-01 20:23:43 +01:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								97bbee19b7 
								
							 
						 
						
							
							
								
								Update docker-py version in requirements to 1.7.2  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-02-23 14:55:06 -08:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								ba39d4cc77 
								
							 
						 
						
							
							
								
								Use docker-py 1.7.1  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-02-22 12:56:54 -08:00  
						
					 
				
					
						
							
							
								 
								Spencer Rinehart
							
						 
						
							 
							
							
							
							
								
							
							
								5e6dc3521c 
								
							 
						 
						
							
							
								
								Add support for shm_size.   Fixes   #2823 .  
							
							 
							
							... 
							
							
							
							shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22).  This requires docker-py 1.8.0
(docker/docker-py#923 ).
Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).
Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com> 
							
						 
						
							2016-02-10 15:25:18 -06:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								be236d8801 
								
							 
						 
						
							
							
								
								Update docker-py and dockerpty  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2016-02-04 19:16:01 +00:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								e69ef1c456 
								
							 
						 
						
							
							
								
								Bump docker-py version to latest RC  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-01-27 00:36:38 +00:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								77b435f4fe 
								
							 
						 
						
							
							
								
								Use latest docker-py rc  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-01-21 18:07:14 -08:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								f3e55568d1 
								
							 
						 
						
							
							
								
								Fix interactive run with networking  
							
							 
							
							... 
							
							
							
							Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2016-01-21 18:42:59 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								c3968a439f 
								
							 
						 
						
							
							
								
								Refactor config loading to move version check into ConfigFile.  
							
							 
							
							... 
							
							
							
							Adds the cached_property package.
Signed-off-by: Daniel Nephin <dnephin@docker.com> 
							
						 
						
							2016-01-14 11:45:15 -05:00  
						
					 
				
					
						
							
							
								 
								Jonathan Stewmon
							
						 
						
							 
							
							
							
							
								
							
							
								b6618815b9 
								
							 
						 
						
							
							
								
								update docker-py requirement to use master branch  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com> 
							
						 
						
							2016-01-13 16:18:00 -06:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								df6877a277 
								
							 
						 
						
							
							
								
								Use newer docker-py version  
							
							 
							
							... 
							
							
							
							Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-01-05 15:09:39 -08:00  
						
					 
				
					
						
							
							
								 
								Joffrey F
							
						 
						
							 
							
							
							
							
								
							
							
								b4be7b870f 
								
							 
						 
						
							
							
								
								Add support for declaring named volumes in compose files  
							
							 
							
							... 
							
							
							
							* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API
Signed-off-by: Joffrey F <joffrey@docker.com> 
							
						 
						
							2016-01-05 15:09:39 -08:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								265828f4eb 
								
							 
						 
						
							
							
								
								Fix texttable dep. 0.8.2 was removed from pypi.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@docker.com> 
							
						 
						
							2015-11-17 18:36:58 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								0227b3adbd 
								
							 
						 
						
							
							
								
								Upgrade pyyaml to 3.11  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@docker.com> 
							
						 
						
							2015-11-05 10:26:54 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								7c6e7e0dce 
								
							 
						 
						
							
							
								
								Update docker-py to 1.5.0  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@docker.com> 
							
						 
						
							2015-10-14 11:18:21 -04:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								d1dd06a7e2 
								
							 
						 
						
							
							
								
								Update docker-py to 1.4.0  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-09-11 15:42:20 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								0484e22a84 
								
							 
						 
						
							
							
								
								Add enum34 and use it to create a ConvergenceStrategy enum.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@gmail.com> 
							
						 
						
							2015-09-04 10:45:53 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								9d7ad796a3 
								
							 
						 
						
							
							
								
								bump requests to 2.7 to fix the ResponseNotReady() error, and add a missing default for tox posargs  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@docker.com> 
							
						 
						
							2015-09-03 14:11:44 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								59d4f304ee 
								
							 
						 
						
							
							
								
								Run pre-commit on all files  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@gmail.com> 
							
						 
						
							2015-08-24 17:04:50 -04:00  
						
					 
				
					
						
							
							
								 
								Mazz Mosley
							
						 
						
							 
							
							
							
							
								
							
							
								da36ee7cbc 
								
							 
						 
						
							
							
								
								Perform schema validation  
							
							 
							
							... 
							
							
							
							Define a schema that we can pass to jsonschema to validate against the
config a user has supplied. This will help catch a wide variety of common
errors that occur.
If the config does not pass schema validation then it raises an exception
and prints out human readable reasons.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com> 
							
						 
						
							2015-08-07 12:06:34 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								f4dac02947 
								
							 
						 
						
							
							
								
								Update docker-py to 1.3.1  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-07-23 10:56:21 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								4ba9d9dac2 
								
							 
						 
						
							
							
								
								Make parallel tasks interruptible with Ctrl-C  
							
							 
							
							... 
							
							
							
							The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.
Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-07-20 14:13:25 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								35aef1aee0 
								
							 
						 
						
							
							
								
								Merge pull request  #1687  from mnowster/1651-parallelise-stopping-containers  
							
							 
							
							... 
							
							
							
							1651 parallelise stopping containers 
							
						 
						
							2015-07-15 16:29:54 +01:00  
						
					 
				
					
						
							
							
								 
								Mazz Mosley
							
						 
						
							 
							
							
							
							
								
							
							
								a68ca199a2 
								
							 
						 
						
							
							
								
								Execute container commands in parallel  
							
							 
							
							... 
							
							
							
							Commands able to use this parallelisation are `stop`, `kill` and `rm`.
We're using a backported function from python 3, to allow us to make
the most of a pool of threads without having to write the low level
code for managing this ourselves.
A default value for number of threads is a low enough number so it
shouldn't cause performance problems but if someone knows the
capability of their system and wants to increase it, they can via
an environment variable DEFAULT_MAX_WORKERS
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com> 
							
						 
						
							2015-07-15 11:02:50 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								fdc34a187e 
								
							 
						 
						
							
							
								
								Use docker-py 1.3.0  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-07-14 16:17:12 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								ac56ef3d65 
								
							 
						 
						
							
							
								
								Update docker-py to 1.2.3 final  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-06-18 11:11:51 -07:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								08bc4b830b 
								
							 
						 
						
							
							
								
								Fix volume binds de-duplication  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-06-12 16:57:22 -04:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								ce880af821 
								
							 
						 
						
							
							
								
								Update dockerpty to 0.3.4  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-06-08 17:01:03 -04:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								9bbf1a33d1 
								
							 
						 
						
							
							
								
								Update dockerpty to 0.3.3  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-05-14 20:03:50 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								1dccd58209 
								
							 
						 
						
							
							
								
								Update docker-py to 1.2.2  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-05-12 18:51:45 +01:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								2e6bc078fb 
								
							 
						 
						
							
							
								
								Implement 'labels' option  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-04-29 16:45:18 +01:00  
						
					 
				
					
						
							
							
								 
								Kyle Walker
							
						 
						
							 
							
							
							
							
								
							
							
								d17c4d27fa 
								
							 
						 
						
							
							
								
								Support alternate Dockerfile name.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com> 
							
						 
						
							2015-04-24 08:30:36 -07:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								f4ef2c09d6 
								
							 
						 
						
							
							
								
								Revert "Remove restriction for requests version, update docker-py requirement"  
							
							 
							
							... 
							
							
							
							This reverts commit 81a32a266f .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-03-23 15:04:15 -07:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								965426e39b 
								
							 
						 
						
							
							
								
								Revert "Add 'labels:' config option"  
							
							 
							
							... 
							
							
							
							This reverts commit 721327110d .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-03-23 15:04:04 -07:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								721327110d 
								
							 
						 
						
							
							
								
								Add 'labels:' config option  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> 
							
						 
						
							2015-03-20 18:12:04 -07:00  
						
					 
				
					
						
							
							
								 
								Rotem Yaari
							
						 
						
							 
							
							
							
							
								
							
							
								81a32a266f 
								
							 
						 
						
							
							
								
								Remove restriction for requests version, update docker-py requirement  
							
							 
							
							
							
						 
						
							2015-03-13 14:39:11 +02:00  
						
					 
				
					
						
							
							
								 
								Aanand Prasad
							
						 
						
							 
							
							
							
							
								
							
							
								8610adcaf3 
								
							 
						 
						
							
							
								
								Merge pull request  #997  from abesto/use-latest-docker-py  
							
							 
							
							... 
							
							
							
							Use docker-py 1.0.0 
							
						 
						
							2015-03-02 14:15:18 +00:00  
						
					 
				
					
						
							
							
								 
								Zoltan Nagy
							
						 
						
							 
							
							
							
							
								
							
							
								8f38b28816 
								
							 
						 
						
							
							
								
								Use docker-py 1.0.0  
							
							 
							
							... 
							
							
							
							Signed-off-by: Zoltan Nagy <abesto@abesto.net> 
							
						 
						
							2015-03-02 13:11:02 +01:00  
						
					 
				
					
						
							
							
								 
								Igor Ch
							
						 
						
							 
							
							
							
							
								
							
							
								f1fc1d7a16 
								
							 
						 
						
							
							
								
								Move several steps closer to python3 compatibility  
							
							 
							
							... 
							
							
							
							Signed-off-by: Igor Ch <usrenmae@gmail.com> 
							
						 
						
							2015-02-28 23:26:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Nephin
							
						 
						
							 
							
							
							
							
								
							
							
								0bc4a28dcc 
								
							 
						 
						
							
							
								
								Use latest docker-py.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Daniel Nephin <dnephin@gmail.com> 
							
						 
						
							2015-01-25 15:33:15 -05:00  
						
					 
				
					
						
							
							
								 
								Ben Firshman
							
						 
						
							 
							
							
							
							
								
							
							
								788741025e 
								
							 
						 
						
							
							
								
								Upgrade to docker-py 0.6.0  
							
							 
							
							... 
							
							
							
							Force using remote API version 1.14 so Fig is still compatible with
Docker 1.2.
Signed-off-by: Ben Firshman <ben@firshman.co.uk> 
							
						 
						
							2014-12-09 10:57:45 -08:00  
						
					 
				
					
						
							
							
								 
								Ben Firshman
							
						 
						
							 
							
							
							
							
								
							
							
								38a3ee8d63 
								
							 
						 
						
							
							
								
								Use upstream dockerpty 0.3.2  
							
							 
							
							... 
							
							
							
							This reverts commit 60411e9f05 .
Closes  #556 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Conflicts:
	requirements.txt
	setup.py 
							
						 
						
							2014-11-04 10:23:42 +00:00