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

2452 Commits

Author SHA1 Message Date
Joffrey F 842dc14417 Merge pull request #2660 from albers/completion-down 
bash completion for `docker-compose down`
 2016-01-14 15:17:45 -08:00
Joffrey F 07c5103fe1 Merge pull request #2661 from albers/completion--abort-on-container-exit 
bash completion for `docker-compose up --abort-on-container-exit`
 2016-01-14 15:17:22 -08:00
Aanand Prasad 47e53b49c2 Merge pull request #2653 from shin-/Runscope-build-args 
Support for build arguments
 2016-01-14 23:13:54 +00:00
Joffrey F 1ae57d92d4 Remove duplicate functions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 14:39:06 -08:00
Aanand Prasad ee7a51c179 Merge pull request #2650 from dnephin/interpolate_config_in_volumes 
Interpolate variables in the new sections of the Compose file
 2016-01-14 22:04:46 +00:00
Clemens Gutweiler ce9f2681a2 Fixes #1422: ipv6 addr contains colons, so we split only by the first char. 
Signed-off-by: Clemens Gutweiler <cg@vioma.de>
 2016-01-14 22:26:35 +01:00
Joffrey F 13063a96cb Fix handling of service.dockerfile key 
Made invalid in v2 format
Doesn't break build config anymore

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 12:15:37 -08:00
Garrett Heel 9cfa71ceee Add support for build arguments 
Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
 2016-01-14 12:14:56 -08:00
Daniel Nephin 77b4ebc31f Merge pull request #2591 from moxiegirl/remove-todo 
Fixing TODO visible in docs
 2016-01-14 15:06:38 -05:00
Daniel Nephin 79df2ebe1b Support variable interpolation for volumes and networks sections. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 14:04:57 -05:00
Harald Albers fca3e47a75 bash completion for `docker-compose up --abort-on-container-exit` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 10:43:53 -08:00
Aanand Prasad 3750811eed Merge pull request #2564 from aanand/2478-networks-in-compose-file 
Declare networks in Compose file
 2016-01-14 18:32:29 +00:00
Harald Albers a7be0afa5b bash completion for `docker-compose down` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 10:32:06 -08:00
Aanand Prasad d98b64f6e7 Remove duplicated logic from initialize_networks() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:09:45 +00:00
Aanand Prasad 4e61377c6d Move get_networks() out of Project class 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:01:44 +00:00
Aanand Prasad 87326c00eb Python 3 fixes 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad 73fbd01cfe Support the 'external' option for networks 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad ca68c9faa4 Services can join 'bridge' or 'host' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad e75629392d Don't join the bridge network by default in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad 9c91cf2967 Test discoverability across multiple networks 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 3eafdbb01b Connect services to networks with the 'networks' key 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 3f9038aea9 Remove test duplication 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 35e347cf92 Disable the use of 'net' in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 69ed5f9c48 Specify networks in Compose file 
There's not yet a proper way for services to join networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:36 +00:00
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