tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,954 Commits 22 Branches 267 Tags 56 MiB
Commit Graph

1954 Commits

Author SHA1 Message Date
Mary Anthony 4ca210edd7 Removing references to boot2docker 
- Replace with machine references
- 1.8 boot2docker is deprecated

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 16:17:46 -07:00
Aanand Prasad 4b4c4f37bd Merge pull request #1718 from moxiegirl/propos-alternates 
remove cli
 2015-07-17 17:25:08 +01:00
Mary Anthony 2407193594 remove cli 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 09:15:29 -07:00
Aanand Prasad 98eab03c61 Merge pull request #1068 from likeon/master 
Docs: yml link in getting started with django
 2015-07-17 17:11:38 +01:00
Aanand Prasad faa7da6eff Merge pull request #1515 from aanand/allow-any-volume-mode 
Allow any volume mode to be specified
 2015-07-17 17:10:59 +01:00
Aanand Prasad 89f6caf871 Allow any volume mode to be specified 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 16:14:09 +01:00
Aanand Prasad a3191ab90f Add container_name option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:50:09 +01:00
Aanand Prasad 35092f1d5e Fix regression in docs for 'up' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:29:02 +01:00
Aanand Prasad 445fe89fce Tweak wording of scale warning 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:24:17 +01:00
Aanand Prasad 9ffe69a572 Refactor can_be_scaled for clarity 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:24:17 +01:00
Aanand Prasad 6ca781416e Merge pull request #1715 from moxiegirl/propos-alternates 
Updating Compose documentation
 2015-07-17 15:23:53 +01:00
Mary Anthony 36f4d413fd Updating Compose documentation 
- Split out commands into individual pages for maintainability
- Add full usage in commands pages for usability
- Updated description of the run command
- adding in Aanand's comment

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 07:05:45 -07:00
Mazz Mosley c8643828d2 Merge pull request #1702 from aanand/smart-recreate-by-default 
Smart recreate by default
 2015-07-17 14:39:40 +01:00
Aanand Prasad ced94a3504 Make smart recreate the default 
Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 11:28:02 +01:00
Aanand Prasad b2cb5a48d2 Merge pull request #1714 from aanand/scale-timeout 
Make scale timeout configurable, default to 10
 2015-07-17 10:13:30 +01:00
Aanand Prasad 9d0bbdf8dd Make scale timeout configurable, default to 10 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-16 16:39:38 +01:00
Aanand Prasad ca298309e0 Merge pull request #1713 from mnowster/increase-default-worker-number 
Increase max-workers
 2015-07-16 16:33:01 +01:00
Mazz Mosley 29f51f8216 Increase max-workers 
There's significant speed improvement by having more workers. This
value still shouldn't cause anyone's machines to melt/explode.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-16 16:17:26 +01:00
Mazz Mosley da6cbd4535 Improve output for parallel command 
This approach takes the style of replacing the output message, in
place, when the command has finished executing. Bringing it a bit
more inline with what `docker pull` does.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-16 11:51:45 +01:00
Aanand Prasad 29ceef6d93 Merge pull request #1706 from aanand/bump-1.3.3 
Bump 1.3.3
 2015-07-16 11:40:20 +01:00
Aanand Prasad 8cff440800 Bump 1.3.3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-16 11:21:01 +01:00
Mazz Mosley e5f6ae767d Merge pull request #1704 from aanand/fix-timeout-type 
Make sure up/restart/stop timeout is an int
(cherry picked from commit c7dccccd1f)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-16 11:19:21 +01:00
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 7b9664be8e)

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>
 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 1e71eebc74)

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 81707ef1ad)

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 5231288b4e)

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 2bc10db545)

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 f42fd6a3ad)

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 d85688892c)

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 bc14c473c9)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-14 17:24:15 +01:00