a248cfd65a
Merge pull request #1692 from bfirsh/coverage
...
Add test coverage support
2015-08-05 11:32:33 +01:00
8ddf37c4b3
Merge pull request #1778 from aanand/remove-script-docs
...
Remove custom docs script
2015-08-02 07:36:49 -07:00
41b9df7639
Merge pull request #1800 from aanand/volume-driver-support
...
Support volume_driver
2015-07-31 16:28:46 +01:00
b25f05bed4
Merge pull request #1799 from d2bit/clean-rails-quickstart-guide-db-config
...
Remove useless postgres 'port' configuration
2015-07-31 07:27:45 -07:00
a68ee0d9c2
Support volume_driver in compose
...
* Add support for volume_driver parameter in compose yml
* Don't expand volume host paths if a volume_driver is specified
(i.e., disable compose feature "relative to absolute path
transformation" when volume drivers are in use, since volume drivers
can use name where host path is normally specified; this is a
heuristic)
Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-07-31 15:23:15 +01:00
1a9ddf645d
Remove useless postgres 'port' configuration
...
Signed-off-by: David BF <burretfresket@gmail.com>
2015-07-31 14:40:29 +02:00
ea7276031c
Merge pull request #1794 from aanand/add-test-for-trailing-slash-volume-copy
...
Add test for trailing slash volume copying bug
2015-07-30 07:18:57 -07:00
27bd987f28
Add test for trailing slash volume copying bug
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-30 10:31:54 +01:00
dc7bdd10d4
Merge pull request #1787 from aanand/fix-duplicate-volume-bind
...
Fix "Duplicate volume mount" error when config has trailing slashes
2015-07-30 09:59:08 +01:00
b47bb84ea1
Merge pull request #1754 from aanand/wait-for-all-containers-to-exit
...
Wait for all containers to exit
2015-07-30 09:58:49 +01:00
80d90a745a
Make sure an exception in any iterator gets raised in the main thread
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/cli/multiplexer.py
2015-07-29 19:42:33 +01:00
a9942b512a
Wait for all containers to exit when running 'up' interactively
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 19:42:33 +01:00
27378704df
Isolate STOP logic in multiplexer module
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 19:42:33 +01:00
03c3d4c768
generator -> iterator
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 19:42:33 +01:00
9768872507
Fix "Duplicate volume mount" error when config has trailing slashes
...
When an image declares a volume such as `/var/lib/mysql`, and a Compose
file has a line like `./data:/var/lib/mysql/` (note the trailing slash),
Compose creates duplicate volume binds when *recreating* the container.
(The first container is created without a hitch, but contains multiple
entries in its "Volumes" config.)
Fixed by normalizing all paths in volumes config.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 18:42:08 +01:00
276e369c31
Merge pull request #1777 from aanand/update-api-version
...
Update API version to 1.19
2015-07-29 16:59:42 +01:00
118a389646
Update API version to 1.19
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 15:44:21 +01:00
2759ab5ab6
Merge pull request #1780 from gheart/specify_api_version_via_env
...
Allow API version specification via env var
2015-07-29 15:42:57 +01:00
1496734cbb
Merge pull request #1779 from aanand/mac-binary-error-hint
...
Add hint about OS X binary compatibility
2015-07-29 15:06:55 +01:00
fc203d643a
Allow API version specification via env var
...
Hard-coding the API version to '1.18' with the docker-py constructor will
cause the docker-py logic at
https://github.com/docker/docker-py/blob/master/docker/client.py#L143-L146
to always fail, which will cause authentication issues if you're using a
remote daemon using API version 1.19 - regardless of the API version of
the registry.
Allow the user to set the API version via an environment variable. If
the variable is not present, it will still default to '1.18' like it
does today.
Signed-off-by: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
2015-07-29 08:44:47 -04:00
b08e23d351
Add hint about OS X binary compatibility
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 10:44:38 +01:00
430ba8cda3
Remove custom docs script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-28 16:59:37 +01:00
487eae3b7b
Merge pull request #1774 from moxiegirl/test-entire-build
...
Contributors can build public docs with compose docs in context
2015-07-28 15:03:46 +01:00
7eabc06df5
Updating build so that contributors can build public docs
...
Changed base image
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-27 09:43:16 -07:00
e832e86f09
Merge pull request #1762 from aanand/update-changelog-and-install
...
Update CHANGES.md and install.md for latest stable version
2015-07-23 16:37:02 +01:00
33a108f9bb
Merge pull request #1760 from alunduil/add-completion-to-sdist
...
add all completions to sdist
2015-07-23 07:34:30 -07:00
65cc84140a
Merge pull request #1736 from aanand/deprecate-allow-insecure-ssl
...
Deprecate --allow-insecure-ssl
2015-07-23 14:09:17 +01:00
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
70c7d27c4e
Merge pull request #1758 from mnowster/improve-scale-test-coverage
...
Improve scale test coverage
2015-07-23 11:07:48 +01:00
04a773f1c8
Deprecate --allow-insecure-ssl
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
f4dac02947
Update docker-py to 1.3.1
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
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
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
ef44c46c72
add all completions to sdist
...
The zsh completion was recently added but missed from the sdist. This
includes all completions that might be added at any point.
Signed-off-by: Alex Brandt <alunduil@alunduil.com>
2015-07-22 21:17:15 -05:00
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
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
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
Mazz Mosley
moxiegirl
Aanand Prasad
Daniel Nephin
Luke Marsden
David BF
Reilly Herrewig-Pope
Mazz Mosley
Alex Brandt
Ben Firshman
Christoph Witzany