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,444 Commits 24 Branches 268 Tags
Commit Graph

1444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
27378704df Isolate STOP logic in multiplexer module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad
03c3d4c768 generator -> iterator 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad
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
Aanand Prasad
276e369c31 Merge pull request #1777 from aanand/update-api-version 
Update API version to 1.19
 2015-07-29 16:59:42 +01:00
Aanand Prasad
118a389646 Update API version to 1.19 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 15:44:21 +01:00
Aanand Prasad
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
Aanand Prasad
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
Reilly Herrewig-Pope
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
Aanand Prasad
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
Aanand Prasad
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
Mary Anthony
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
Aanand Prasad
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
Daniel Nephin
33a108f9bb Merge pull request #1760 from alunduil/add-completion-to-sdist 
add all completions to sdist
 2015-07-23 07:34:30 -07:00
Mazz Mosley
65cc84140a Merge pull request #1736 from aanand/deprecate-allow-insecure-ssl 
Deprecate --allow-insecure-ssl
 2015-07-23 14:09:17 +01:00
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
Aanand Prasad
04a773f1c8 Deprecate --allow-insecure-ssl 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 10:56:21 +01:00
Aanand Prasad
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
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
Alex Brandt
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
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