tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,842 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

50 Commits

Author SHA1 Message Date
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
Aanand Prasad 0f58b9f6b4 Update docker-py to 0.5.3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 18:46:55 +01:00
Aanand Prasad 60411e9f05 Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7 
Include TLS fixes and relative imports:

c8b4935534

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 16:24:39 +01:00
Ben Firshman b0159e5100 Upgrade to docker-py 0.5.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-08 09:23:01 -07:00
Daniel Nephin 7fd37c89b9 Remove fig.packages replace with real deps. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-05 11:44:49 -07:00
d11wtq 847ec5b559 Update dockerpty -> 0.2.3 
Signed-off-by: d11wtq <chris@w3style.co.uk>
 2014-07-29 01:17:28 +00:00
Chris Corbyn dcd8e7863f Update dockerpty. Fixes #352. 2014-07-27 08:17:38 +00:00
Chris Corbyn 361294d20b Update dockerpty for non-TTY multiplexing. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-07-05 08:23:21 +00:00
Aanand Prasad 3c48884dbb Update dockerpty; stub it out in tests 
Its current behaviour occasionally causes tests to hang; until this is
resolved, we'll stub it out. We weren't testing the output of 'run'
anyhow (though we should be).
 2014-06-27 14:41:36 +01:00
Chris Corbyn 8c6b516aa0 Update dockerpty to fix discovered race condition. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-26 11:41:43 +00:00
Chris Corbyn 3770aac1af Use dockerpty instead for pseudo-tty behaviour. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-25 15:54:52 +00:00
Ben Firshman 8e42d6fbb3 Remove six from requirements 
It was vendorised in 75c430635b
 2014-03-03 12:08:38 +00:00
Ben Firshman 21837ac132 Update docker-py 
From 2014572941
 2014-01-28 14:51:19 +00:00
Ben Firshman 7c9c55785d Move mock to dev requirements 2014-01-27 10:00:36 +00:00
Ben Firshman 7abc4fbf3a Improve ps CLI test 2014-01-20 16:50:41 +00:00
Aanand Prasad 21528f08d4 Vendor docker-py 
From 9dc03c5737
 2014-01-16 13:30:01 +00:00
Aanand Prasad 7a4b69edc0 Remove compat texttable module - breaks on Python 2.7 2014-01-09 15:32:59 +00:00
Ben Firshman 7888027425 Put requirements back in .txt files 
Read-only FS in travis
 2014-01-06 17:58:50 +00:00
Christopher Grebs 93b9b6fd9f First version with python3 support. 
* Moved requirements*.txt files to proper spec definitions in setup.py
 * Added a new fig.compat module to store some compatibility code
 2014-01-06 17:58:49 +00:00
Ben Firshman 5cc4b59dc0 Switch to stable docker-py 2013-12-20 21:25:52 +00:00
Aanand Prasad 23c3dc430b Add texttable to requirements.txt 2013-12-18 16:20:03 +00:00
Ben Firshman 6a2d528d2e Add port binding 2013-12-16 11:25:01 +00:00
Ben Firshman 3b654ad349 Add basic CLI 2013-12-11 14:25:32 +00:00
Aanand Prasad 084b06cd12 Install docker-py from GitHub 
Just use requirements.txt for now, as doing it in setup.py is a pain.
 2013-12-09 16:29:53 +00:00