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

2566 Commits

Author SHA1 Message Date
Aanand Prasad 8fca4f1628 Merge pull request #2649 from dnephin/make_volumes_from_more_explicit 
Make volumes from more explicit in V2 config format
 2016-01-14 17:15:27 +00:00
Daniel Nephin 172b955d79 Merge pull request #2646 from dnephin/docker_compose_down 
docker-compose down
 2016-01-14 11:59:02 -05:00
Daniel Nephin b76dc1e05e Require volumes_from a container to be explicit in V2 config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:16 -05:00
Daniel Nephin c3968a439f Refactor config loading to move version check into ConfigFile. 
Adds the cached_property package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:15 -05:00
Daniel Nephin de949284f5 Refactor config loading for handling volumes_from in v2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:43:47 -05:00
Aanand Prasad dbe04a70f0 Merge pull request #2655 from shin-/updated_volume_definition 
Properly validate volume definition
 2016-01-14 16:37:39 +00:00
Daniel Nephin c64af0a459 Add an acceptance test and docs for the down subcommand 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:11:08 -05:00
Daniel Nephin c8ed156806 Adding docker-compose down 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 10:59:53 -05:00
Aanand Prasad 18df1e170d Merge pull request #2625 from kojiromike/allow-list-entrypoints 
Allow Entrypoints to be Lists
 2016-01-14 12:48:13 +00:00
Aanand Prasad 7733600262 Merge pull request #2508 from jstewmon/stop_signal 
add support for stop_signal to compose file
 2016-01-14 12:46:04 +00:00
Aanand Prasad 1ffd172084 Merge pull request #2654 from dnephin/fix_multiplex_test 
Fix flaky multiplex test
 2016-01-14 12:27:46 +00:00
Joffrey F e41e6c1241 Properly validate volume definition 
Test valid empty volume definitions

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 18:22:29 -08:00
Daniel Nephin 6877c6ca06 Fix flaky multiplex test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-13 20:58:44 -05:00
Joffrey F 153185eadb Merge pull request #2647 from shin-/preexisting_volume_detection_rb1 
Support for external volumes
 2016-01-13 17:02:36 -08:00
Michael A. Smith 9bff308251 Document Entrypoints and Commands as Lists 
Signed-off-by: Michael A. Smith <msmith3@ebay.com>
 2016-01-13 17:47:30 -05:00
Michael A. Smith 59a4ab9634 Allow Entrypoints to be Lists 
Signed-off-by: Michael A. Smith <msmith3@ebay.com>
 2016-01-13 17:45:56 -05:00
Jonathan Stewmon b6618815b9 update docker-py requirement to use master branch 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-13 16:18:00 -06:00
Joffrey F e76b2679eb external volume disallows other config keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 14:12:03 -08:00
Aanand Prasad fa01883cb2 Merge pull request #2632 from hourliert/master 
Mount $HOME in /root to share docker config between containers.
 2016-01-13 21:17:18 +00:00
Aanand Prasad a08e02f3bd Merge pull request #2643 from sdurrheimer/zsh-completion-events 
Add zsh completion for 'docker-compose events'
 2016-01-13 21:10:36 +00:00
Aanand Prasad 9f34354c19 Merge pull request #2638 from albers/completion-events 
Add bash completion for `docker-compose events`
 2016-01-13 21:10:09 +00:00
Joffrey F c260eb910b Merge pull request #2629 from dbonev/2611-support-port-range-in-compose 
Port range in exposed ports
 2016-01-13 13:09:22 -08:00
Aanand Prasad 3aba5bb67e Merge pull request #2620 from dbonev/2607-ulimits-not-merged-in-extended-services 
Ulimits are now merged into extended services
 2016-01-13 21:05:38 +00:00
Daniel Nephin d56f64c30a Merge pull request #2130 from scipetr/master 
Add flag for stops all containers if any container was stopped.
 2016-01-13 15:55:19 -05:00
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