tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 23:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,343 Commits 21 Branches 282 Tags
Commit Graph

3343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
97c9c12660 Merge pull request #2023 from TomasTomecek/593-implement-exec 
implement exec
 2016-02-29 12:21:41 -08:00
Aanand Prasad
6b947ee478 Document ways to make services wait for dependencies 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-29 11:24:58 -08:00
Jesus
6bfb23baaa Display containers name when scale a container 
Display in the log output the name of those containers created using the scale command and
change the test_scale_with_api_error test to support the containers name when scale

Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2016-02-29 20:19:03 +01:00
Tomas Tomecek
d28c5dda92 implement exec 
Resolves #593

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-02-29 10:50:09 +01:00
Aanand Prasad
62fb6b99eb Update FAQ regarding long stop times 
- It happens on recreate, not just stop

- We now support `stop_signal`, which can help in some cases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-26 14:34:44 -08:00
Aanand Prasad
1502c5a14d Merge pull request #3025 from aanand/release-notes-1.6.2 
Add release notes for 1.6.2
 2016-02-26 10:36:26 -08:00
Aanand Prasad
c72e9b3843 Add release notes for 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:55:04 -08:00
Aanand Prasad
5be48ba1ed Update docs about using build and image together 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:19:58 -08:00
Aanand Prasad
adb8de367e Merge pull request #2388 from dnephin/fix_long_lines 
Wrap long lines
 2016-02-25 16:52:33 -08:00
Aanand Prasad
42f4d814d7 Merge pull request #2880 from dnephin/merge_jsonschemas 
Merge jsonschemas to a single schema file per version
 2016-02-25 16:51:56 -08:00
Victoria Bialas
5cc420e727 WIP: updated note format for dockerfile per Aanand's comments on PR #3019 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-25 16:47:46 -08:00
Aanand Prasad
c2c8c41ef2 Merge pull request #2608 from dnephin/more_cyclomatic_reduction 
More cyclomatic complexity reduction
 2016-02-25 16:41:49 -08:00
Aanand Prasad
2cd1b94dd3 Update note about build + image with extends 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 15:15:18 -08:00
Aanand Prasad
5111d0862c Merge pull request #2672 from dnephin/organize_scripts 
Organize scripts into directories
 2016-02-25 14:09:03 -08:00
Daniel Nephin
11dc720752 Move test scripts to script/test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:24:13 -08:00
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
Aanand Prasad
9eb1204958 Merge pull request #3010 from aanand/bump-1.6.2 
Bump 1.6.2
 2016-02-23 17:02:34 -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
Aanand Prasad
4d720279a0 Bump 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.6.2 		2016-02-23 15:52:13 -08:00
Joffrey F
796dc91eb1 Update docker-py version in requirements to 1.7.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 15:52:13 -08:00
Aanand Prasad
a7da06d920 Merge remote-tracking branch 'release/release' into bump-1.6.2 2016-02-23 15:49:21 -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
Daniel Nephin
c1b7d6c6ad Merge pull request #3006 from dnephin/bump-1.6.1 
WIP: Bump 1.6.1
 2016-02-23 12:37:12 -08:00
Daniel Nephin
a75c16cb1b Bump 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.6.1 		2016-02-23 12:08:56 -08:00
Mary Anthony
e08409f18d Updating Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-23 12:08:56 -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
9d7dbe3857 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:58:16 -08:00
Daniel Nephin
bcd5286cd3 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:58:16 -08:00
Daniel Nephin
daebf74d6c Stop other containers if the flag is set. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Richard Bann
155d813606 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-23 11:52:51 -08:00
Daniel Nephin
73c2f8ee37 Fix warning about boolean values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
4aae2c3b7b Use docker-py 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
b79ad5f966 Fix validation message when there are multiple ested oneOf validations. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Victoria Bialas
f8e3c46fbb copyedit to make show as file format 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:52:51 -08:00
Victoria Bialas
f7c923062d corrected description of network aliases, added real-world example per #2907 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
61906ac2ff Update documentation for volume_driver option. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
ea8032c115 Make config validation error messages more consistent. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
7d22809ef4 Validate that each section of the config is a mapping before running interpolation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Anthon van der Neut
cfda9d844e for 1.6.0 the version value needs to be a string 
After conversion a file would immediately not load in docker-compose 1.6.0 with the message:

  ERROR: Version in "./converted.yml" is invalid - it should be a string.

Signed-off-by: Anthon van der Neut anthon@mnt.org
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-23 11:52:51 -08:00