tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,515 Commits 21 Branches 280 Tags
Commit Graph

1515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
db31adc208 Extract link names into a function. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-10 19:32:30 -04:00
Daniel Nephin
805f6a7683 Refactor network_mode logic out of Service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-10 19:32:30 -04:00
Daniel Nephin
d92f323e6d Fixes #1757 - include all service properties in the config_dict() 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 19:32:30 -04:00
Daniel Nephin
cf2dbf55b8 Cleanup some project logic. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 19:32:30 -04:00
Daniel Nephin
8d4c724c2d Sort config keys 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 19:32:30 -04:00
Daniel Nephin
9cb2770da4 Make external_links a regular service.option so that it's part of the config hash 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 19:32:30 -04:00
Daniel Nephin
6a23491fa9 Resolves #1856, fix regression in #1645. Includes some refactoring to make testing easier. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 19:32:30 -04:00
Mazz Mosley
294b9742be Handle all exceptions 
If we get back an error that wasn't an APIError, it was causing the
thread to hang. This catch all, while I appreciate feels risky to
have a catch all, is better than not catching and silently failing,
with a never ending thread.

If something worse than an APIError has gone wrong, we want to stop
the incredible journey of what we're doing.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-10 19:32:30 -04:00
Aanand Prasad
a9b1f15f92 Fix volume path warning 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-10 19:32:29 -04:00
Aanand Prasad
28139ab90d Bump 1.4.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.4.0 		2015-08-11 16:00:20 +01:00
Aanand Prasad
d0792b49fa Merge pull request #1846 from aanand/fix-mem-limit-options 
Fix mem_limit and memswap_limit regression
(cherry picked from commit 93cc7e375130ebaaa287bb5d7e04f59bd0d6d98e)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 16:00:20 +01:00
Mazz Mosley
5548aa5c79 Merge pull request #1833 from aanand/deprecate-relative-volumes-without-dot 
Show a warning when a relative path is specified without "./"
(cherry picked from commit 52733f699681c3ee762917d2d837fa4bd8c4a9ba)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/config.py
	tests/unit/config_test.py
 2015-08-11 12:57:42 +01:00
Ben Firshman
16440ff055 Merge pull request #1829 from vlajos/typofixes-vlajos-20150807 
typofix - https://github.com/vlajos/misspell_fixer
(cherry picked from commit b7baa899e271fd13f17592be015b8bf066c17245)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 09:44:28 +01:00
Ben Firshman
7850d6de45 Merge pull request #1832 from aanand/use-docker-1.8.0-rc3 
Test against Docker 1.8.0 RC3
(cherry picked from commit afc9629c59117ab2ae050b91d1e732234591b47f)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 09:44:28 +01:00
Ben Firshman
74b4fb89bb Merge pull request #1835 from aanand/fix-crash-when-container-has-no-name 
Ignore containers that don't have a name
(cherry picked from commit 4e12ce39b35ea49bfdcd6677b26a46eb593ec208)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 09:44:27 +01:00
Ben Firshman
22ccf35fa1 Merge pull request #1836 from aanand/use-overlay-driver-in-tests 
Use overlay driver in tests
(cherry picked from commit 197d332620dcf063cc888b8a64e6fa875a2e0943)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 09:44:27 +01:00
Aanand Prasad
7ad1fe24bd Merge pull request #1815 from aanand/abort-if-daemon-cant-start 
Abort tests if daemon fails to start
(cherry picked from commit f7b9daf927cfa31324193d4b426c1c0d848e8bdf)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 09:44:27 +01:00
Aanand Prasad
450ba978c1 Merge pull request #1812 from moxiegirl/install-update-for-1811 
Closes #1811 for Toolbox
(cherry picked from commit 6cb8e512f211696d6c1ba5482606d791eaf302a3)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	docs/install.md
 2015-08-10 12:51:10 +01:00
Aanand Prasad
3d6946417d Merge pull request #1800 from aanand/volume-driver-support 
Support volume_driver
(cherry picked from commit 41b9df763925dee4f5702dc48ce18a76cbca19f2)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 16:29:24 +01:00
Daniel Nephin
31cf63b374 Merge pull request #1799 from d2bit/clean-rails-quickstart-guide-db-config 
Remove useless postgres 'port' configuration
(cherry picked from commit b25f05bed4d8865c8d236576e99d8d44571702d4)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:46:07 +01:00
Daniel Nephin
5c853c4a2c Merge pull request #1794 from aanand/add-test-for-trailing-slash-volume-copy 
Add test for trailing slash volume copying bug
(cherry picked from commit ea7276031c237c8c1f8bc6131102b5a73c29826e)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:29:44 +01:00
Aanand Prasad
ad922cd7a1 Merge pull request #1787 from aanand/fix-duplicate-volume-bind 
Fix "Duplicate volume mount" error when config has trailing slashes
(cherry picked from commit dc7bdd10d45093fff2d51ec20d67928a17f3a06f)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:29:44 +01:00
Aanand Prasad
49bafdc4cd Merge pull request #1777 from aanand/update-api-version 
Update API version to 1.19
(cherry picked from commit 276e369c3167b4f5e189b33e8a55ff6fd7115142)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:29:44 +01:00
Aanand Prasad
989b2491b9 Merge pull request #1780 from gheart/specify_api_version_via_env 
Allow API version specification via env var
(cherry picked from commit 2759ab5ab6bbe81bb33151cf0fbc21862f0c9346)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:29:44 +01:00
Aanand Prasad
ca2ce3a034 Merge pull request #1779 from aanand/mac-binary-error-hint 
Add hint about OS X binary compatibility
(cherry picked from commit 1496734cbb2f2084c978eb90f8671bcd970c7095)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:29:43 +01:00
Aanand Prasad
dfe9dccab8 Merge pull request #1774 from moxiegirl/test-entire-build 
Contributors can build public docs with compose docs in context
(cherry picked from commit 487eae3b7b1e36d037a8fdcf181fdf1bbf9c40cc)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-31 15:29:43 +01:00
Aanand Prasad
d456c3909d Merge remote-tracking branch 'origin/release' into bump-1.4.0 2015-07-23 16:46:57 +01: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