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

2363 Commits

Author SHA1 Message Date
Aanand Prasad a14906fd35 Fix 'run' behaviour with networks 
- Test that one-off containers join all networks
- Don't set any aliases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 17:28:55 +00:00
Aanand Prasad 1e51b7e88b Merge pull request #2722 from aanand/fix-scale-race-condition 
Fix scale race condition
 2016-01-21 17:08:15 +00:00
Aanand Prasad 013c5ea3f9 Merge pull request #2713 from aanand/links-v2 
Support links in v2 files
 2016-01-21 17:08:05 +00:00
Aanand Prasad 7a4fdfd034 Merge pull request #2712 from jzvelc/fix_v2_service_extend 
Fix `extends` when using v2 config format
 2016-01-21 17:06:21 +00:00
Aanand Prasad 642e71b4c7 Stop and remove containers in parallel when scaling down 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 15:28:40 +00:00
Aanand Prasad 755c49b500 Fix scale when containers exit immediately 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 15:19:55 +00:00
Aanand Prasad ee63075a34 Support links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 14:34:26 +00:00
Aanand Prasad 5a249bd9f5 Fix Windows build failures when installing dependencies from git 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 11:39:08 +00:00
Jure Žvelc 907c3ce42b Fix for extending services written in v2 format. 
Signed-off-by: Jure Žvelc <jzvelc@gmail.com>
 2016-01-20 18:46:16 +01:00
Aanand Prasad e35bf47a7f Merge pull request #2708 from dnephin/implement_depends_on 
Implement depends_on
 2016-01-20 17:46:10 +00:00
Aanand Prasad fd6b7d1747 Merge pull request #2693 from dnephin/migrate_v1_to_v2 
Add a migration script for v1 to v2 compose format
 2016-01-20 17:45:01 +00:00
Daniel Nephin 3b1a0e6fc9 Add stop signal to the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 21:33:04 -05:00
Daniel Nephin 5aadf5a187 Update tests in sort_services_test.py to use pytest. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 15:52:17 -05:00
Daniel Nephin 146587643c Move ulimits validation to validation.py and improve the error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 15:47:57 -05:00
Daniel Nephin 0bce467782 Implement depends_on to define an order for services in the v2 format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 15:41:45 -05:00
Daniel Nephin 85619842be Add migration script. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 14:50:41 -05:00
Daniel Nephin c39489f540 Don't copy over volumes that were previously host volumes, and are now container volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 14:41:21 -05:00
Daniel Nephin c47aea9c12 Merge pull request #2698 from aanand/fix-name-is-reserved 
Fix "name is reserved" with Engine 1.10 RC1
 2016-01-19 10:15:06 -05:00
Daniel Nephin 1be147f775 Merge pull request #2696 from aanand/test-external-default 
Test that you can set the default network to be external
 2016-01-19 10:09:42 -05:00
Aanand Prasad 2106481c23 Fix "name is reserved" with Engine 1.10 RC1 
Ensure link aliases are unique (this deduping was previously performed
on the server).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-19 11:27:27 +00:00
Aanand Prasad 5b2b4cbb07 Merge pull request #2692 from aanand/fix-tls-paramater-error 
Catch TLSParameterErrors from docker-py
 2016-01-19 11:25:21 +00:00
Aanand Prasad 746033ed9d Test that you can set the default network to be external 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-19 10:57:12 +00:00
Aanand Prasad 413cdbcb81 Merge pull request #2675 from sdurrheimer/zsh-completion-up-abort-on-container-exit 
Add zsh completion for 'docker-compose up --abort-on-container-exit'
 2016-01-19 10:41:08 +00:00
Aanand Prasad 683c8b0067 Merge pull request #2676 from sdurrheimer/zsh-completion-down-command 
Add zsh completion for 'docker-compose down'
 2016-01-19 10:40:29 +00:00
Aanand Prasad 9d2e1f58d9 Merge pull request #2677 from sdurrheimer/zsh-completion-fix-invalid-commands-cache 
Fix zsh completion to ensure we have enough commands to store in the …
 2016-01-19 10:40:03 +00:00
Aanand Prasad adedbee41b Merge pull request #2694 from dnephin/release_script_fixes 
Fix some bugs in release scripts
 2016-01-19 10:39:06 +00:00
Aanand Prasad 9ccef1ea91 Catch TLSParameterErrors from docker-py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 21:48:12 +00:00
Daniel Nephin 66dd9ae9a4 Fix some bugs in release scripts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-18 15:59:40 -05:00
Aanand Prasad 341fa58b21 Merge pull request #2690 from aanand/ipam-config 
Allow custom ipam config
 2016-01-18 19:44:07 +00:00
Aanand Prasad b863fe5723 Merge pull request #2687 from aanand/update-networking-docs 
Update networking docs
 2016-01-18 18:59:33 +00:00
Aanand Prasad afae365050 Allow custom ipam config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 18:56:18 +00:00
Aanand Prasad 6b105a6e92 Update networking docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 18:45:29 +00:00
Aanand Prasad da490f5b0a Merge pull request #2686 from aanand/fix-custom-default-network 
Allow overriding of config for the default network
 2016-01-18 17:08:25 +00:00
Aanand Prasad e7673bf920 Allow overriding of config for the default network 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 16:17:39 +00:00
Aanand Prasad 53d56ea245 Quote network names in error messages 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 16:15:52 +00:00
Steve Durrheimer d54190167a Fix zsh completion to ensure we have enough commands to store in the cache 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-16 13:53:16 +01:00
Steve Durrheimer f6561f1290 Add zsh completion for 'docker-compose down' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-16 13:47:48 +01:00
Steve Durrheimer e7180982aa Add zsh completion for 'docker-compose up --abort-on-container-exit' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-16 13:22:02 +01:00
Joffrey F a677a2c1f0 Merge pull request #2674 from dnephin/use-1.10-rc1 
Test against docker 1.10.0-rc1
 2016-01-15 17:13:56 -08:00
Daniel Nephin ab927b986f Test against 1.10rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 19:04:01 -05:00
Daniel Nephin cce3b29688 Merge pull request #2665 from dnephin/check_extends_use_same_version 
Validate that an extended config file has the same version as the base
 2016-01-15 18:07:56 -05:00
Daniel Nephin 9e805731e7 Merge pull request #2671 from dnephin/fix_linux_master_build 
Fix linux master build
 2016-01-15 15:23:24 -05:00
Daniel Nephin 82b288b25b Fix linux master build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 15:02:19 -05:00
Daniel Nephin 0f1a798f28 Increase the timeout for all acceptance tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 10:14:55 -05:00
Aanand Prasad a104e11191 Merge pull request #2659 from aanand/default-network-alias 
Containers join each network aliased to their service's name
 2016-01-15 03:30:07 +00:00
Daniel Nephin dc1104649f Validate that an extended config file has the same version as the base. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 22:28:20 -05:00
Aanand Prasad de6d6a42d7 Tag some more v2-dependent tests 
Not clear why the config tests are v2-dependent; needs investigating

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:24 +00:00
Aanand Prasad 4772815491 Disable tests until Engine 1.10 change has been worked around 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:24 +00:00
Aanand Prasad fbc275e06b Work around error message change in Engine 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:24 +00:00
Aanand Prasad cba75627e1 Fix error when joining host/bridge network 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:24 +00:00