tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 16:14:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,582 Commits 21 Branches 282 Tags
Commit Graph

4582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mazz Mosley
c7dccccd1f Merge pull request #1704 from aanand/fix-timeout-type 
Make sure up/restart/stop timeout is an int
 2015-07-16 10:50:06 +01:00
Mazz Mosley
3a775388b2 Merge pull request #1698 from aanand/use-docker-1.7.1 
Test against Docker 1.6.2 and 1.7.1
 2015-07-16 10:48:24 +01:00
moxiegirl
947bce043e Merge pull request #1699 from bfirsh/link-to-waffle-board-from-contributing 
Link to waffle board from CONTRIBUTING.md
 2015-07-15 15:13:51 -07:00
Aanand Prasad
cd44179305 Merge pull request #1705 from aanand/fix-labels-null 
Handle case where /containers/json returns "Labels": null
(cherry picked from commit 7b9664be8e82b03f316d88c928953c62e897c2cd)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 17:33:08 +01:00
Aanand Prasad
7b9664be8e Merge pull request #1705 from aanand/fix-labels-null 
Handle case where /containers/json returns "Labels": null
 2015-07-15 17:30:31 +01:00
Aanand Prasad
0c5c8d1f00 Handle case where /containers/json returns "Labels": null 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 17:13:33 +01:00
Mazz Mosley
5a46230555 Merge pull request #1703 from aanand/rename-max-workers 
Rename max workers environment variable
 2015-07-15 16:59:53 +01:00
Aanand Prasad
ec8bf066ba Make sure up/restart/stop timeout is an int 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:56:39 +01:00
Aanand Prasad
f03dec766d Rename max workers env var and fix docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:43:43 +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
Aanand Prasad
6c7c63ce34 Merge pull request #1693 from ekristen/remove_tty_wrap 
Do not wrap table cells
 2015-07-15 16:27:27 +01:00
Aanand Prasad
e675d67774 Test against Docker 1.6.2 and 1.7.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 14:37:44 +01:00
Ben Firshman
200b408843 Link to waffle board from CONTRIBUTING.md 
Closes #1067

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-07-15 11:56:46 +01:00
Mazz Mosley
03d34336a8 Document DEFAULT_MAX_WORKERS 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-15 11:56:06 +01:00
Aanand Prasad
847f839cab Merge pull request #1559 from aanand/update-swarm-docs 
Update Swarm docs
 2015-07-15 11:43:10 +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
Ben Firshman
aab6df6ba4 Add test coverage support 
Prints out results on console and puts HTML report in `coverage-html`.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-07-15 10:09:37 +01:00
Erik Kristensen
7937611366 change 80 to 0 
Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
 2015-07-14 12:31:00 -06:00
Erik Kristensen
b7edb3ca9d do not wrap table cells 
Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
 2015-07-14 12:30:42 -06:00
Aanand Prasad
c3c5b354b8 Merge pull request #1690 from aanand/bump-1.3.2 
Bump 1.3.2
 2015-07-14 18:04:22 +01:00
Aanand Prasad
95cf195dbd Bump 1.3.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.3.2 		2015-07-14 17:40:43 +01:00
Aanand Prasad
a80afd67ab Merge pull request #1688 from aanand/use-docker-py-1.3.0 
Use docker-py 1.3.0
(cherry picked from commit 1e71eebc7475ac5307eace3a3b9e97dc0d3873cd)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:29:25 +01:00
Aanand Prasad
4bc4d273ac Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers 
Show an error on 'run' when there are legacy one-off containers
(cherry picked from commit 81707ef1ad94403789166d2fe042c8a718a4c748)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:29:12 +01:00
Aanand Prasad
4911c77134 Merge pull request #1489 from dnephin/faster_integration_tests 
Faster integration tests
(cherry picked from commit 5231288b4e44d15a9ca553504faeac3b618f49d6)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
 2015-07-14 17:28:54 +01:00
Aanand Prasad
c1b9a76a54 Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image 
Fix smart recreate when 'image' is changed to something nonexistent
(cherry picked from commit 2bc10db5451ec8e69119997061b0ba5c692feb90)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:25:33 +01:00
Aanand Prasad
c31e25af72 Merge pull request #1642 from aanand/fix-1573 
Fix bug where duplicate container is leftover after 'up' fails
(cherry picked from commit f42fd6a3ad17cf9688e709bfed1639196777a342)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:25:03 +01:00
Aanand Prasad
c8295d36cc Merge pull request #1644 from aanand/fix-rm-bug 
Stop 'rm' and 'ps' listing services not defined in the current file
(cherry picked from commit d85688892cb64128093db98d6f03d97ff8bd0e40)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:24:15 +01:00
Aanand Prasad
b12c29479e Merge pull request #1521 from dano/validate-service-names 
Validate that service names passed to Project.containers aren't bogus.
(cherry picked from commit bc14c473c97af14ed150160fe84d23fcb05fe4e2)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:24:15 +01:00
Aanand Prasad
1e71eebc74 Merge pull request #1688 from aanand/use-docker-py-1.3.0 
Use docker-py 1.3.0
 2015-07-14 16:55:44 +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
Mazz Mosley
2db0a377e2 Minor test refactor 
Rather than creating a docker client within each test, create one
at setup and make it accessible to the whole class.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-13 14:11:12 +01:00
Aanand Prasad
81707ef1ad Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers 
Show an error on 'run' when there are legacy one-off containers
 2015-07-08 14:48:03 +01:00
Aanand Prasad
a8ad13734e Merge pull request #1666 from mnowster/docs-for-extends-file-default-behaviour 
Docs for `file` default behaviour
 2015-07-07 17:12:29 +01:00
Aanand Prasad
8b033d3946 Merge pull request #1665 from mnowster/1648-support-log-opt 
1648 support log opt
 2015-07-07 17:08:04 +01:00
Mazz Mosley
ef8ae07145 Docs for file default behaviour 
Change in behaviour, `file` key is optional and if not set the
default is to look within the same file as `extends` is defined.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 17:01:09 +01:00
Mazz Mosley
6f31e8ebe9 Add support for log_opt 
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 16:26:43 +01:00
Aanand Prasad
2bc10db545 Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image 
Fix smart recreate when 'image' is changed to something nonexistent
 2015-07-07 16:12:44 +01:00
Aanand Prasad
531265bc84 Fix smart recreate when 'image' is changed to something nonexistent 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-07 16:01:44 +01:00
Mazz Mosley
c1223bfd3a Keep config keys in alphabetised order 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 12:02:05 +01:00
Aanand Prasad
e9da790f76 Merge pull request #1660 from mnowster/754-add-option-memswap-limit 
Add in memswap_limit run option
 2015-07-07 10:09:49 +01:00
Mazz Mosley
fc26982132 Add in memswap_limit run option 
By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-06 17:08:57 +01:00
Aanand Prasad
e98caf5cf9 Show an error on 'run' when there are legacy one-off containers 
Also warn the user about the one-off containers in the standard error
message about legacy containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-06 14:45:17 +01:00
Daniel Nephin
20218394b9 Merge pull request #1649 from albers/doc-completion-zsh 
Mention zsh command completion in general install section
 2015-07-06 06:41:09 -07:00
Aanand Prasad
fc8f564558 Merge pull request #1632 from mnowster/extends_file_default_behaviour 
Extends file default behaviour and fixes circular reference bug
 2015-07-06 13:28:54 +01:00
Aanand Prasad
0fa5808389 Merge pull request #1623 from mnowster/documentation-fixes 
Documentation fixes
 2015-07-06 13:25:56 +01:00
Harald Albers
2fc7cd6e03 Mention zsh command completion in general install section 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-05 19:18:24 +02:00
Aanand Prasad
d90202399a Merge pull request #1645 from dnephin/fix_up_race 
Fix race condition in docker-compose up
 2015-07-03 16:28:22 +01:00
Aanand Prasad
f42fd6a3ad Merge pull request #1642 from aanand/fix-1573 
Fix bug where duplicate container is leftover after 'up' fails
 2015-07-03 16:25:53 +01:00
Aanand Prasad
d85688892c Merge pull request #1644 from aanand/fix-rm-bug 
Stop 'rm' and 'ps' listing services not defined in the current file
 2015-07-03 16:22:48 +01:00
Daniel Nephin
bd554a6fea Fix race condition in docker-compose up. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-03 10:29:46 -04:00