tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,092 Commits 21 Branches 282 Tags
Commit Graph

3092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Nephin
d2556a1347 Bump 1.6.0-rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.6.0-rc1 		2016-01-18 14:50:56 -05:00
Aanand Prasad
237f134a00 Allow custom ipam config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 14:50:56 -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
d4720f85ef Update networking docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 14:03:52 -05: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
64fc2b85cb Allow overriding of config for the default network 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 12:14:12 -05:00
Aanand Prasad
a22d248390 Quote network names in error messages 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 12:14:12 -05: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
Daniel Nephin
fffedfc87b Test against 1.10rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-16 11:35:04 -05: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
34fd042dbf Increase the timeout for all acceptance tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 18:12:57 -05:00
Daniel Nephin
89e31f7a8d Validate that an extended config file has the same version as the base. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 18:12:56 -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
b446c09735 Merge remote-tracking branch 'docker/release' into bump-1.6.0-rc1 2016-01-15 17:02:06 -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
Aanand Prasad
ab2d18851f Test against a dev build of Engine 1.10 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:20 +00:00
Aanand Prasad
406b6b28f4 Tag v2-only tests 
- Don't run them against Engine < 1.10
- Set the API version appropriately for the Engine version, so all tests
  use API version 1.22 against Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:08:20 +00:00
Aanand Prasad
abd031cb3d Containers join each network aliased to their service's name 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:08:20 +00:00
Daniel Nephin
2a2eb81215 Merge pull request #2662 from dnephin/fix_config_printing_unicode 
Fix config printing unicode objects
 2016-01-14 19:26:39 -05:00
Aanand Prasad
493df49d55 Merge pull request #2658 from dnephin/warn_on_caps 
Error when the project name is invalid for the default image name
 2016-01-14 23:41:04 +00:00
Daniel Nephin
1bfbba36b2 Ensure that the config output by config command never contains python objects. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:33:58 -05:00
Daniel Nephin
3021ee12fe Fix config command to print the new sections of the config 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:28:17 -05:00
Daniel Nephin
0f234154c2 Remove all non-external networks on down. 
Also moves the shutdown test fixtures to be a more general v2-full fixture.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:28:17 -05:00
Daniel Nephin
b98e2169e6 Error when the project name is invalid for the image name. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:25:23 -05:00
Daniel Nephin
b689c4a218 Move service validation to validate_service(). 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:25:22 -05:00