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

2785 Commits

Author SHA1 Message Date
Daniel Nephin ec6bb1660d Move run scripts to script/run 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:24:13 -08:00
Daniel Nephin a87d482a3b Move all build scripts to script/build 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:24:13 -08:00
Daniel Nephin dc3a5ce624 Refactor config validation to support constraints in the same jsonschema 
Reworked the two schema validation functions to read from the same schema but
use different parts of it. Error handling is now split as well by the
schema that is being used to validate.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:20:17 -08:00
Daniel Nephin 43ecf8793a Address old TODO, and small refactor of container name logic in service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:19:38 -08:00
Daniel Nephin cdda616d6b Reduce complexity of sort_service_dicts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:19:38 -08:00
Daniel Nephin 84a1822e40 Reduce complexity of _get_container_create_options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:19:38 -08:00
Daniel Nephin be554c3a74 Merge v1 config jsonschemas into a single file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 15:59:10 -08:00
Daniel Nephin adb64ef8d5 Merge v2 config jsonschemas into a single file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 15:59:10 -08:00
Daniel Nephin 38dd342b7b Merge pull request #3009 from dnephin/update_release_notes 
Add release notes for 1.6.1
 2016-02-23 16:02:18 -08:00
Joffrey F f48d321b5b Merge pull request #3008 from shin-/update_dockerpy_version 
Update docker-py version in requirements to 1.7.2
 2016-02-23 15:41:11 -08:00
Daniel Nephin 49ef8a271d Add release notes for 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 15:13:01 -08:00
Daniel Nephin 0467bc3dcf Merge pull request #2998 from londoncalling/docs-wordpress-example 
updated Wordpress example to be easier to follow, added/updated images
 2016-02-23 15:10:11 -08:00
Joffrey F 97bbee19b7 Update docker-py version in requirements to 1.7.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 14:55:06 -08:00
Victoria Bialas e6797e1166 updated Wordpress example to be easier to follow, added/updated images 
docs update per Mary's comments on the PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:59:19 -08:00
Daniel Nephin f2ccbeff76 Merge pull request #2997 from dnephin/fix_env_var_without_value 
Fix env var without value
 2016-02-23 11:58:30 -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
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
Joffrey F 633e349ab9 Test network_aliases feature 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:46 -08:00
Joffrey F 2b5d3f51cb Allow user to specify custom network aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:46 -08:00
Joffrey F d3a95c2892 Merge pull request #2938 from shin-/2927-buildargs-types 
Constraint build argument types. Numbers are cast into strings.
 2016-02-18 15:07:09 -08:00
Joffrey F 93a02e497d Apply driver_opts processing to network configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 10:53:40 -08:00
Aanand Prasad 85ba08bb13 Merge pull request #2932 from AvdN/patch-1 
reset colors after warning
 2016-02-18 09:25:02 -08:00