tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 15:44:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,064 Commits 21 Branches 282 Tags
Commit Graph

2064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mazz Mosley
52733f6996 Merge pull request #1833 from aanand/deprecate-relative-volumes-without-dot 
Show a warning when a relative path is specified without "./"
 2015-08-11 11:21:17 +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
Ben Firshman
b7baa899e2 Merge pull request #1829 from vlajos/typofixes-vlajos-20150807 
typofix - https://github.com/vlajos/misspell_fixer
 2015-08-10 22:13:30 +01:00
Ben Firshman
afc9629c59 Merge pull request #1832 from aanand/use-docker-1.8.0-rc3 
Test against Docker 1.8.0 RC3
 2015-08-10 20:53:01 +01:00
Aanand Prasad
46e8e4322a Show a warning when a relative path is specified without "./" 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 19:56:36 +01:00
Ben Firshman
4e12ce39b3 Merge pull request #1835 from aanand/fix-crash-when-container-has-no-name 
Ignore containers that don't have a name
 2015-08-10 18:50:00 +01:00
Ben Firshman
197d332620 Merge pull request #1836 from aanand/use-overlay-driver-in-tests 
Use overlay driver in tests
 2015-08-10 18:47:29 +01:00
Aanand Prasad
7f90e9592a Use overlay driver in tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 18:05:09 +01:00
Aanand Prasad
dfa4bf4452 Ignore containers that don't have a name 
If a container is in the process of being removed, or removal has
failed, it can sometimes appear in the output of GET /containers/json
but not have a 'Name' key. In that case, rather than crashing, we can
ignore it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 16:29:12 +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
6cb8e512f2 Merge pull request #1812 from moxiegirl/install-update-for-1811 
Closes #1811 for Toolbox
 2015-08-10 12:48:25 +01:00
Aanand Prasad
4390362366 Test against Docker 1.8.0 RC3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 12:01:51 +01:00
Mary Anthony
7c128b46a1 - Closes #1811 for Toolbox 
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-09 10:51:39 -07:00
Veres Lajos
11adca9324 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 22:34:24 +01:00
Mazz Mosley
d1455acb64 Update docs inline with feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 16:30:00 +01:00
Yuval Kohavi
557cbb616c ports documentation 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00
Yuval Kohavi
0fdd977b06 fixed merge issue from previous commit 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00
Yuval Kohavi
297941e460 rebasing port range changes 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00
Mazz Mosley
df74b131ff Use split_port for ports format check 
Rather than implement the logic a second time, use docker-py
split_port function to test if the ports is valid.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 15:27:30 +01:00
Mazz Mosley
2e428f94ca Refactor validation out 
Move validation out into its own file without causing circular
import errors.

Fix some of the tests to import from the right place.

Also fix tests that were not using valid test data, as the validation
schema is now firing telling you that you couldn't "just" have this
dict without a build/image config key.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
0557b5dce6 Remove dead code 
These functions weren't being called by anything.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
ea3608e1f4 Improve test coverage for validation 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
d8aee782c8 Error handling 
jsonschema provides a rich error tree of info, by parsing each error
we can pull out relevant info and re-write the error messages.

This covers current error handling behaviour.

This includes new error handling behaviour for types and formatting of
the ports field.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
8d6694085d Include remaining valid config properties 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
98c7a7da61 Order properties alphabetically 
Improves readability.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
6c7c598546 Format validation of ports 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
76e6029f21 Replace service tests with config tests 
We validate the config against our schema before a service is created
so checking whether a service name is valid at time of instantiation of
the Service class is not needed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
da36ee7cbc Perform schema validation 
Define a schema that we can pass to jsonschema to validate against the
config a user has supplied. This will help catch a wide variety of common
errors that occur.

If the config does not pass schema validation then it raises an exception
and prints out human readable reasons.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley
22b7ee42de Merge pull request #1817 from aanand/update-volume-tests 
Update volume tests for clarity
 2015-08-06 18:09:58 +01:00
Aanand Prasad
fdaa5f2cde Update volume tests for clarity 
- Better method names.

- Environment variable syntax in volume paths, even when a driver is
  specified, now *will* be processed (the test wasn't testing it
  properly). However, `~` will still *not* expand to the user's home
  directory.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 16:14:37 +01:00
Aanand Prasad
f7b9daf927 Merge pull request #1815 from aanand/abort-if-daemon-cant-start 
Abort tests if daemon fails to start
 2015-08-06 15:29:55 +01:00
Mazz Mosley
44f1207931 Merge pull request #1765 from aanand/interpolate-environment-variables 
Interpolate environment variables
 2015-08-06 15:13:30 +01:00
Aanand Prasad
4f14298694 Abort tests if daemon fails to start 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 14:45:35 +01:00
Aanand Prasad
ee6ff294a2 Show a warning when a variable is unset 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 14:24:11 +01:00
Aanand Prasad
8b5bd945d0 Interpolate environment variables 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 11:18:57 +01:00
Aanand Prasad
31ac3ce22a Split out compose.config.errors 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-05 15:50:22 +01:00
Aanand Prasad
92ef1f5702 Make compose.config a proper module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-05 15:50:22 +01:00
Mazz Mosley
a248cfd65a Merge pull request #1692 from bfirsh/coverage 
Add test coverage support
 2015-08-05 11:32:33 +01:00
moxiegirl
8ddf37c4b3 Merge pull request #1778 from aanand/remove-script-docs 
Remove custom docs script
 2015-08-02 07:36:49 -07: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
Aanand Prasad
41b9df7639 Merge pull request #1800 from aanand/volume-driver-support 
Support volume_driver
 2015-07-31 16:28:46 +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