tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,422 Commits 24 Branches 268 Tags
Commit Graph

1422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
227435f613 Update CHANGES.md and install.md for latest stable version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 11:09:27 +01:00
Aanand Prasad
70c7d27c4e Merge pull request #1758 from mnowster/improve-scale-test-coverage 
Improve scale test coverage
 2015-07-23 11:07:48 +01:00
Mazz Mosley
2c8aade13e Space for errors 
It was harder to see when there are errors if they came straight after
the other output. Putting a newline in there gives it a bit of visual
room.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-23 10:55:57 +01:00
Mazz Mosley
119901c19b Improve test coverage for scale 
Also includes tiny amount of code cleanup, being explicit with imports.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-23 10:55:57 +01:00
Aanand Prasad
fc32ccefca Merge pull request #1755 from aanand/fix-container-name-one-off 
Don't use custom name for one-off containers
 2015-07-22 18:14:31 +01:00
Aanand Prasad
1739448402 Don't use custom name for one-off containers 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-22 15:39:56 +01:00
Mazz Mosley
620dac53f6 Merge pull request #1746 from aanand/remove-logging-test 
Remove logging test
 2015-07-21 16:34:58 +01:00
Aanand Prasad
dc62279d02 Merge pull request #1734 from mnowster/1653-scale-in-parallel 
Parallelise scale
 2015-07-21 16:02:04 +01:00
Aanand Prasad
4035a203fa Merge pull request #1745 from bfirsh/2015-07-21-roadmap-update 
Update roadmap with state convergence
 2015-07-21 16:01:13 +01:00
Aanand Prasad
233c509f71 Remove logging test 
It doesn't do much other than cause the remainder of the test suite to
generate lots of junk output.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 15:56:37 +01:00
Mazz Mosley
e1c1a4c0aa Scale restarts stopped containers 
This is existing behaviour and should be kept.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-21 15:41:22 +01:00
Ben Firshman
41406cdd68 Update roadmap with state convergence 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-07-21 15:37:55 +01:00
Mazz Mosley
cc0bfea8a1 Merge pull request #1711 from aanand/custom-names 
Add container_name option for specifying a custom container name
 2015-07-21 14:28:16 +01:00
Mazz Mosley
090879b67a Merge pull request #1737 from aanand/update-completion-for-force-recreate 
Update bash and zsh completion for --force-recrate
 2015-07-21 12:18:16 +01:00
Mazz Mosley
3ec7124539 Merge pull request #1742 from DoubleMalt/patch-1 
Fix required version of websockets-client
 2015-07-21 12:16:23 +01:00
Mazz Mosley
f721389447 Merge pull request #1743 from aanand/fix-stream-stack-trace 
Stop printing a stack trace when there's an error when pulling
 2015-07-21 12:15:18 +01:00
Mazz Mosley
da650e9cfd Refactor parallel execute 
Refactored parallel execute and execute create into a single function
parallel_execute that can now handle both cases. This helps untangle it
from being so tightly coupled to the container.

Updated all the relevant operations to use the refactored function.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-21 11:56:59 +01:00
Aanand Prasad
38a6209acd Stop printing a stack trace when there's an error when pulling 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 11:07:20 +01:00
Christoph Witzany
04b7490ef2 Fix required version of websockets-client 
Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
 2015-07-21 11:59:32 +02:00
Aanand Prasad
d1fdf1b809 Update bash and zsh completion for --force-recrate 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-20 17:18:39 +01:00
Mazz Mosley
5c29ded6ac Parallelise scale 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-20 16:33:04 +01:00
Mazz Mosley
85c90daa18 Merge pull request #1731 from aanand/fix-ctrl-c 
Make parallel tasks interruptible with Ctrl-C
 2015-07-20 16:05:26 +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
4ffae4a1ac Merge pull request #1725 from moxiegirl/update-docs-dockerfile 
Updating with the latest image
 2015-07-20 12:00:18 +01:00
Aanand Prasad
5f6d0d0824 Merge pull request #1721 from moxiegirl/remove-boot2docker-1720 
Removing references to boot2docker
 2015-07-20 11:52:15 +01:00
Aanand Prasad
05d8daa8e0 Merge pull request #1710 from mnowster/improve-output-for-parallel-executions 
Improve output for parallel command
 2015-07-20 11:49:37 +01:00
Aanand Prasad
9df2be80a8 Merge pull request #1717 from aanand/fix-up-docs 
Fix regression in docs for 'up'
 2015-07-20 11:45:50 +01:00
Mazz Mosley
9d9b865796 Add in error handling 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-20 10:21:49 +01:00
Mazz Mosley
61787fecea Resolve race condition 
Sometimes, some messages were being executed at the same time, meaning
that the status wasn't being overwritten, it was displaying on a
separate line for both doing and done messages.

Rather than trying to have both sets of statuses being written out
concurrently, we write out all of the doing messages first. Then
the done messages are written out/updated, as they are completed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-20 10:21:49 +01:00
Mary Anthony
949dd5b2c7 Updating with the latest image 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-19 16:08:01 -07:00
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
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