tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-19 19:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,617 Commits 21 Branches 280 Tags
Commit Graph

2617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d4720f85ef Update networking docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 14:03:52 -05: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
Daniel Nephin
fffedfc87b Test against 1.10rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-16 11:35:04 -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
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
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
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
Joffrey F
796d97e394 Merge pull request #2617 from gutweiler/extra-hosts-ipv6 
Extra hosts ipv6
 2016-01-14 15:19:12 -08:00
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