tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,304 Commits 21 Branches 266 Tags 54 MiB
Commit Graph

2304 Commits

Author SHA1 Message Date
Daniel Nephin eced525317 Merge pull request #2651 from aanand/increase-signal-test-timeout 
Increase timeout on signal-handling tests
 2016-01-13 15:45:34 -05:00
Aanand Prasad 85a210d9eb Increase timeout on signal-handling tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-13 20:34:07 +00:00
Joffrey F d601199eb5 Normalize external_name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 12:07:08 -08:00
Joffrey F 8616b2de51 Update error message when external volume is missing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 11:23:06 -08:00
Evgeniy Dobrohvalov bf48a781db Add flag for stops all containers if any container was stopped. 
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
 2016-01-13 13:12:09 +03:00
Joffrey F f774422d18 Test Volume.exists() behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:58:24 -08:00
Joffrey F 9cb58b796e Implement ability to specify external volumes 
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:53:49 -08:00
Joffrey F 05935b5e54 Don't recreate pre-existing volumes. 
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 15:42:42 -08:00
Jonathan Stewmon 5d8c2d3cec add support for stop_signal to compose file 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-12 17:21:49 -06:00
Joffrey F ad8faad296 Merge pull request #2579 from vdemeester/update-reference-with-config-and-create 
Add config and create to docs/reference
 2016-01-12 15:16:45 -08:00
Aanand Prasad d4b4b126fb Merge pull request #2635 from aanand/use-networking 
Use networking for version 2 Compose files
 2016-01-12 22:19:50 +00:00
Dimitar Bonev 3a46abd17f Allowed port range in exposed ports 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-13 00:13:04 +02:00
Dimitar Bonev 2f07e2ac36 Ulimits are now merged into extended services 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-12 23:59:23 +02:00
Aanand Prasad 70cce961a8 Don't allow links or external_links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:45 +00:00
Aanand Prasad 9e17cff0ef Refactor API version switching logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:45 +00:00
Aanand Prasad a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Aanand Prasad 1a66543461 Make the default network name '{project name}_default' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Aanand Prasad b786b47bc8 Remove version checks from tests requiring API v1.21 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Aanand Prasad 0c626e63bc Merge pull request #2458 from dnephin/image_and_build_together 
Image and build together
 2016-01-12 21:08:00 +00:00
Steve Durrheimer b59387401c Add zsh completion for 'docker-compose events' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-12 22:04:05 +01:00
Daniel Nephin d32a3ec08f Merge pull request #2639 from dnephin/fix_pep8_errors 
Fix pep8 errors from the new pep8 release.
 2016-01-12 14:13:23 -05:00
Daniel Nephin e98ab0e534 Allow both image and build together. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:10:00 -05:00
Daniel Nephin ed4db542d6 Fix pep8 errors from the new pep8 release. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:02:30 -05:00
Aanand Prasad 9e36847eb9 Merge pull request #2637 from dnephin/fix_pre_commit_on_master 
Fix pre-commit on master
 2016-01-12 18:54:16 +00:00
Harald Albers 6c205a8e01 Add bash completion for `docker-compose events` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-12 10:51:04 -08:00
Daniel Nephin 12b5405420 Fix pre-commit on master. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 13:27:18 -05:00
Daniel Nephin 304a44aeab Merge pull request #2585 from dnephin/short_signal_handlers 
Fix signal handlers by moving shutdown logic out of handler
 2016-01-12 12:55:53 -05:00
Aanand Prasad 52e50a9d9a Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key 
Move logging config under separate key in v2 compose files
 2016-01-12 15:21:10 +00:00
Aanand Prasad 063a25ae7d Merge pull request #2392 from dnephin/docker_compose_events 
docker-compose events
 2016-01-12 11:45:27 +00:00
Joffrey F ca634649bb Changed logging override test into integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 16:25:19 -08:00
Joffrey F 46a474ecd9 Move v1-v2 config normalization to separate function. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 15:53:28 -08:00
Joffrey F c32991a8d4 Remove superfluous service code 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 15:39:59 -08:00
Thomas Hourlier f7a7e68df6 Mount $HOME in /root to share docker config. 
Fixes #2630

Signed-off-by: Thomas Hourlier <thomas.hourlier@cnode.fr>
 2016-01-11 09:52:51 -08:00
Daniel Nephin d3cd038b84 Update event field names to match the new API fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-11 11:51:17 -05:00
Daniel Nephin 2f8cb55412 Merge pull request #2571 from vdemeester/fix-unpause-typo 
Fix typo in unpause reference doc
 2016-01-09 12:31:21 -05:00
Daniel Nephin 37d41f22c6 Merge pull request #2572 from vdemeester/fix-run-missing-flag 
Add missing --name flag to run reference doc
 2016-01-09 12:30:57 -05:00
Joffrey F 46585fb8e1 Support legacy logging options format 
Additional test for legacy compose file.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-08 14:37:07 -08:00
Daniel Nephin fc57fc1dc1 Merge pull request #2609 from dnephin/dont_warn_on_container_volume 
Don't warn when the container volume is a compose option
 2016-01-08 17:18:02 -05:00
Daniel Nephin ab98c70dd1 Merge pull request #2612 from dnephin/merge_extends_from_multiple_files 
Fix extends with multiple files
 2016-01-08 17:17:41 -05:00
Joffrey F 21aae13e77 Move logging config changes to v2 spec 
Reorganize JSON schemas
Update fixtures
Update service validation function

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-08 13:21:45 -08:00
Daniel Nephin d1d3969661 Add docker-compose event 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-08 13:43:30 -05:00
Daniel Nephin f38c29f37b Merge pull request #2624 from aanand/fix-script-clean 
Fix script/clean on systems where `find` requires a path argument
 2016-01-08 10:17:01 -05:00
Aanand Prasad 978e9cf38f Fix script/clean on systems where `find` requires a path argument 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-08 13:10:05 +00:00
Dimitar Bonev ed5f7bd394 log_driver and log_opt moved to logging key. 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-08 01:54:45 +02:00
Aanand Prasad e7bba2affe Merge pull request #2300 from dnephin/always_unicode_literal 
Use "unicode_literals" in all files
 2016-01-07 18:28:22 +00:00
Daniel Nephin bf1552da79 Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:24 -05:00
Daniel Nephin 475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Aanand Prasad ed87d1f848 Merge pull request #2421 from shin-/2110-compose_yml_v2 
Add support for declaring named volumes in compose files
 2016-01-07 16:45:58 +00:00
Vincent Demeester 0bca8d9cb3 Add config and create to docs/reference 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-06 21:28:52 +01:00
Vincent Demeester 4e75ed4231 Add missing --name flag to run reference doc 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-06 21:15:11 +01:00