836ec70979
Stop connecting to all networks on container creation
...
This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:22 +00:00
6ca410fd6b
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-26 11:52:22 +00:00
38a6d04852
Update documentation for `external` param
...
Signed-off-by: Joffrey F <joffrey@docker.com>
Conflicts:
docs/compose-file.md
2016-01-26 11:52:22 +00:00
0952c1bb51
Add links to networks key references
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
18a1829db0
Update documentation for links
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
e40de088f3
Document depends_on
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
6fe54f5c24
Update Compose file documentation for version 2
...
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
5cfd947f38
Stop and remove containers in parallel when scaling down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
513a6b35cc
Fix scale when containers exit immediately
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
cbec6f8834
Support links in v2 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
76bc06b729
Fix Windows build failures when installing dependencies from git
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:21 +00:00
c9ef1fa32f
Fix for extending services written in v2 format.
...
Signed-off-by: Jure Žvelc <jzvelc@gmail.com>
2016-01-26 11:52:20 +00:00
c52eed66b7
Update tests in sort_services_test.py to use pytest.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-26 11:52:20 +00:00
3f65bdcf46
Move ulimits validation to validation.py and improve the error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-26 11:52:20 +00:00
6e5c312768
Implement depends_on to define an order for services in the v2 format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-26 11:52:20 +00:00
33bb7c4e02
Add migration script.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-26 11:52:20 +00:00
bb377d3fe6
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-26 11:52:20 +00:00
7442b416e8
Test that you can set the default network to be external
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:20 +00:00
fbee4ce4b3
Catch TLSParameterErrors from docker-py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 11:52:20 +00:00
8398382b65
Add zsh completion for 'docker-compose up --abort-on-container-exit'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-26 11:52:19 +00:00
7dd5fd5763
Add zsh completion for 'docker-compose down'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-26 11:52:19 +00:00
d5f3826ec7
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-26 11:52:19 +00:00
20c936a251
Fix some bugs in release scripts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-26 11:52:19 +00:00
d2556a1347
Bump 1.6.0-rc1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-18 14:50:56 -05:00
237f134a00
Allow custom ipam config
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 14:50:56 -05:00
d4720f85ef
Update networking docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 14:03:52 -05:00
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
a22d248390
Quote network names in error messages
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 12:14:12 -05:00
fffedfc87b
Test against 1.10rc1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-16 11:35:04 -05:00
34fd042dbf
Increase the timeout for all acceptance tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-15 18:12:57 -05:00
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
b446c09735
Merge remote-tracking branch 'docker/release' into bump-1.6.0-rc1
2016-01-15 17:02:06 -05:00
9e805731e7
Merge pull request #2671 from dnephin/fix_linux_master_build
...
Fix linux master build
2016-01-15 15:23:24 -05:00
82b288b25b
Fix linux master build.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-15 15:02:19 -05:00
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
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
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
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
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
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
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
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
2a2eb81215
Merge pull request #2662 from dnephin/fix_config_printing_unicode
...
Fix config printing unicode objects
2016-01-14 19:26:39 -05:00
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
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
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
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
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
b689c4a218
Move service validation to validate_service().
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:25:22 -05:00
796d97e394
Merge pull request #2617 from gutweiler/extra-hosts-ipv6
...
Extra hosts ipv6
2016-01-14 15:19:12 -08:00
Aanand Prasad
Joffrey F
Jure Žvelc
Daniel Nephin
Steve Durrheimer
Daniel Nephin
Joffrey F