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
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
35aef1aee0
Merge pull request #1687 from mnowster/1651-parallelise-stopping-containers
...
1651 parallelise stopping containers
2015-07-15 16:29:54 +01:00
6c7c63ce34
Merge pull request #1693 from ekristen/remove_tty_wrap
...
Do not wrap table cells
2015-07-15 16:27:27 +01:00
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
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
03d34336a8
Document DEFAULT_MAX_WORKERS
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-15 11:56:06 +01:00
847f839cab
Merge pull request #1559 from aanand/update-swarm-docs
...
Update Swarm docs
2015-07-15 11:43:10 +01:00
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
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
7937611366
change 80 to 0
...
Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
2015-07-14 12:31:00 -06:00
b7edb3ca9d
do not wrap table cells
...
Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
2015-07-14 12:30:42 -06:00
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
fdc34a187e
Use docker-py 1.3.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 16:17:12 +01:00
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
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
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
8b033d3946
Merge pull request #1665 from mnowster/1648-support-log-opt
...
1648 support log opt
2015-07-07 17:08:04 +01:00
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
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
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
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
c1223bfd3a
Keep config keys in alphabetised order
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-07 12:02:05 +01:00
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
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
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
Aanand Prasad
Mary Anthony
Mazz Mosley
Mazz Mosley
Ben Firshman
Erik Kristensen