620dac53f6
Merge pull request #1746 from aanand/remove-logging-test
...
Remove logging test
2015-07-21 16:34:58 +01:00
dc62279d02
Merge pull request #1734 from mnowster/1653-scale-in-parallel
...
Parallelise scale
2015-07-21 16:02:04 +01:00
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
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
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
41406cdd68
Update roadmap with state convergence
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-07-21 15:37:55 +01:00
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
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
3ec7124539
Merge pull request #1742 from DoubleMalt/patch-1
...
Fix required version of websockets-client
2015-07-21 12:16:23 +01:00
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
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
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
04b7490ef2
Fix required version of websockets-client
...
Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
2015-07-21 11:59:32 +02:00
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
5c29ded6ac
Parallelise scale
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-20 16:33:04 +01:00
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
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
4ffae4a1ac
Merge pull request #1725 from moxiegirl/update-docs-dockerfile
...
Updating with the latest image
2015-07-20 12:00:18 +01:00
5f6d0d0824
Merge pull request #1721 from moxiegirl/remove-boot2docker-1720
...
Removing references to boot2docker
2015-07-20 11:52:15 +01:00
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
9df2be80a8
Merge pull request #1717 from aanand/fix-up-docs
...
Fix regression in docs for 'up'
2015-07-20 11:45:50 +01:00
9d9b865796
Add in error handling
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-20 10:21:49 +01:00
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
949dd5b2c7
Updating with the latest image
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 16:08:01 -07:00
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
4b4c4f37bd
Merge pull request #1718 from moxiegirl/propos-alternates
...
remove cli
2015-07-17 17:25:08 +01:00
2407193594
remove cli
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:15:29 -07:00
98eab03c61
Merge pull request #1068 from likeon/master
...
Docs: yml link in getting started with django
2015-07-17 17:11:38 +01:00
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
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
a3191ab90f
Add container_name option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:50:09 +01:00
35092f1d5e
Fix regression in docs for 'up'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:29:02 +01:00
445fe89fce
Tweak wording of scale warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:24:17 +01:00
9ffe69a572
Refactor can_be_scaled for clarity
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:24:17 +01:00
6ca781416e
Merge pull request #1715 from moxiegirl/propos-alternates
...
Updating Compose documentation
2015-07-17 15:23:53 +01:00
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
c8643828d2
Merge pull request #1702 from aanand/smart-recreate-by-default
...
Smart recreate by default
2015-07-17 14:39:40 +01:00
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
b2cb5a48d2
Merge pull request #1714 from aanand/scale-timeout
...
Make scale timeout configurable, default to 10
2015-07-17 10:13:30 +01:00
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
ca298309e0
Merge pull request #1713 from mnowster/increase-default-worker-number
...
Increase max-workers
2015-07-16 16:33:01 +01:00
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
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
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
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
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
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
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
5a46230555
Merge pull request #1703 from aanand/rename-max-workers
...
Rename max workers environment variable
2015-07-15 16:59:53 +01:00
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
Mazz Mosley
Aanand Prasad
Mazz Mosley
Ben Firshman
Christoph Witzany
Mary Anthony