tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,135 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

3135 Commits

Author SHA1 Message Date
Chia-liang Kao ed5fedf516 Don't mount pwd if it is / 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-23 11:52:51 -08:00
Joffrey F 654b3710f7 Use modern set notation in _get_aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F f4a22b94ed Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F e5689afe4c Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F 42cb719b52 Add v2_only decorator to network aliases test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F 6ac6860dda Fix network list serialization in py3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F 353da73eab Document network_aliases config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F c686be8fd3 Test network_aliases feature 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F 2f7a77e954 Allow user to specify custom network aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F d78ea85301 driver_opts can only be of type string 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin 7c95c733a9 Only set a container affinity if there are volumes to copy over. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F dd9a8d6eee Bring up all dependencies when running a single service. 
Added test for running a depends_on service

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin 4f7c950ca8 Upgrade pyinstaller. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F a1d6e3b9e3 Add logging when initializing a volume. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F 3eac70a9d3 Detailed error message when daemon version is too old. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Manuel Kaufmann c7687592ff Typo fixed 
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin 155efd28fa Merge build.args when merging services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin 2ced83e3d9 Fix build section without context. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Yohan Graterol cea7911f56 Typo into the doc with `networks` in yaml 
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin db12794b1c Fix upgrading url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin deeca57a0d Use 12 characters for the short id to match docker and fix backwards compatibility. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
cr7pt0gr4ph7 edcbe2eb4d Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. 
Signed-off-by: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski ad00f3dd21 Handle the 'network_mode' key when merging multiple compose files. 
Fixes docker/compose#2840.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski c77a8cfe3b Correctly merge the 'services/<service>/networks' key in the case of multiple compose files. 
Fixes docker/compose#2839.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski 8548b75582 Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. 
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Michael Käufl c1be49ad53 Used absolute links in readme 
This prevents links being broken on pypi
(e.g. https://pypi.python.org/pypi/docs/index.md#features)

Signed-off-by: Michael Käufl <docker-compose@c.michael-kaeufl.de>
 2016-02-23 11:52:51 -08:00
Aanand Prasad a716bdc482 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit abec6f5891 Change special case from '_', None to () 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit c195915263 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit 34d8f9b55a Mangle the tests. They pass for better or worse! 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit f5533c1ed8 If an env var is passthrough but not defined on the host don't set it. This doesn't change too much code and keeps the generators. 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin 722e3a2fc7 Merge remote-tracking branch 'docker/release' into bump-1.6.1 2016-02-23 11:15:34 -08:00
Daniel Nephin d451578152 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:14:59 -08:00
Daniel Nephin 4b04280db8 Revert "Change special case from '_', None to ()" 
This reverts commit 677c50650c.

Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior"

This reverts commit 0019037712.

Revert "Mangle the tests. They pass for better or worse!"

This reverts commit 7ab9509ce6.

Revert "If an env var is passthrough but not defined on the host don't set it."

This reverts commit 6540efb3d3.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:13:57 -08:00
Daniel Nephin 1d67e6f0f0 Merge pull request #2995 from dnephin/fix_warning_about_bools 
Fix warning about boolean values
 2016-02-23 11:11:54 -08:00
Daniel Nephin ba799d2e86 Merge pull request #2996 from dnephin/fix_abort_on_container_exit 
Fix abort on container exit
 2016-02-23 10:52:12 -08:00
Joffrey F a7fd578b14 Merge pull request #2962 from shin-/2960-volume-driver 
Update docs for volume_driver option
 2016-02-22 17:23:07 -08:00
Joffrey F 176b966486 Update documentation for volume_driver option. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-22 16:51:33 -08:00
Daniel Nephin 7e3d756a18 Merge pull request #2992 from shin-/update_dockerpy_version 
Use docker-py 1.7.1
 2016-02-22 16:50:36 -08:00
Daniel Nephin 15b2094bad Stop other containers if the flag is set. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-22 16:48:46 -08:00
Richard Bann bf2bf21720 Add failing test for --abort-on-container-exit 
Handle --abort-on-container-exit. Fixes #2940

Signed-off-by: Richard Bann <richardbann@gmail.com>
 2016-02-22 16:39:40 -08:00
Daniel Nephin 0a06d827fa Fix warning about boolean values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-22 14:56:01 -08:00
Joffrey F ba39d4cc77 Use docker-py 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-22 12:56:54 -08:00
Daniel Nephin d5514965d5 Merge pull request #2975 from dnephin/fix_crash_on_none_in_config 
Fix validation message when there are multiple nested oneOf validations.
 2016-02-19 15:53:26 -05:00
Daniel Nephin 02535f0cf1 Fix validation message when there are multiple ested oneOf validations. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-19 14:22:55 -05:00
Daniel Nephin c7ceacfeae Merge pull request #2948 from dnephin/validate_top_level 
Validate that each section of the config is a mapping
 2016-02-19 13:41:50 -05:00
Aanand Prasad bed0cfeb32 Merge pull request #2807 from aanand/swarm-doc 
Update Swarm integration guide and make it an official part of the docs
 2016-02-19 10:25:28 -08:00
Daniel Nephin 0d218c34c7 Make config validation error messages more consistent. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-19 13:12:57 -05:00
Daniel Nephin 4b2a666231 Validate that each section of the config is a mapping before running interpolation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-19 12:38:52 -05:00
Aanand Prasad 520c695bf4 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-19 09:32:43 -08:00