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

3123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 677c50650c86b4b6fabbc21e18165f2117022bbe.

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

This reverts commit 001903771260069c475738efbbcb830dd9cf8227.

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

This reverts commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d.

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

This reverts commit 6540efb3d380e7ae50dd94493a43382f31e1e004.

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
Aanand Prasad
1f2c2942d7 Merge pull request #2963 from londoncalling/docs-alias-repr2829 
corrected description of network aliases, added real-world example pe…
 2016-02-19 09:26:40 -08:00
Victoria Bialas
753c953870 Merge branch 'docs-alias-repr2829' of github.com:londoncalling/compose into docs-alias-repr2829 
Fixed file format of one word, legacy, adding signature to that commit.

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-18 18:32:44 -08:00
Victoria Bialas
eb4a98c0d1 corrected description of network aliases, added real-world example per #2907 
copyedit to make  show as file format

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-18 18:05:52 -08:00
Victoria Bialas
630a50295b copyedit to make show as file format 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-18 18:05:30 -08:00
Victoria Bialas
068a56eb97 corrected description of network aliases, added real-world example per #2907 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-18 17:49:28 -08:00
Joffrey F
5fc0df4be2 Merge pull request #2907 from shin-/2829-net-alias 
Allow user to specify custom network aliases
 2016-02-18 16:01:30 -08:00
Joffrey F
0cb8ba3775 Use modern set notation in _get_aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:28:12 -08:00
Joffrey F
7152f7ea76 Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:24:41 -08:00
Joffrey F
825a0941f0 Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F
4b99b32ffb Add v2_only decorator to network aliases test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F
41e399be98 Fix network list serialization in py3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F
7801cfc5d1 Document network_aliases config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00