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

708 Commits

Author SHA1 Message Date
Daniel Nephin
deeca57a0d Use 12 characters for the short id to match docker and fix backwards compatibility. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
cr7pt0gr4ph7
edcbe2eb4d Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. 
Signed-off-by: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
8548b75582 Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. 
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
c195915263 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
34d8f9b55a Mangle the tests. They pass for better or worse! 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
Aanand Prasad
19ae76a442 Update docker-py and dockerpty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:41:11 +00:00
Dimitar Bonev
64336615cf Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
46f33f12b0 Update merge docs with depends_on, and correction about how links and volumes_from are merged. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
aa5ff05463 Fix merging of lists with multiple files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
61d00ebee4 Extract volume init and removal from project. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3b1276bd44 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3e8a4a5dc3 Don't initialize networks that aren't used by any services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
0c87e0b18f Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
8024f2f09e Tweak and test warning shown when version is a dict 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
f081376067 Improve error messages for invalid versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
ce0d469c18 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
e9ba06ed4b Normalise/fix config field designators in validation messages 
- Instead of "Service 'web' configuration key 'image'", just say
  "web.image"

- Fix the "Service 'services'" bug in the v2 file format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
9e9b36460c Convert validation error tests to pytest style 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Daniel Nephin
bbaae11a0f Fix race condition with up and setting signal handlers. 
Also print stdout on wait_for_container().

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-01 15:51:16 +00:00
Daniel Nephin
24e71db345 Don't copy over volumes that were previously host volumes, and are now container volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad
297d20f085 Remove ability to join bridge network + user-defined networks 
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad
52e74ab7ad Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad
2b46685855 Test that net can be extended 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad
2b7306967b Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Joffrey F
3f28472ebc Move named volumes matching to config validation phase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Joffrey F
3da25aa463 is_named_volume also tests for home paths ~ 
Fix bug with VolumeSpec not being updated
Fix integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Joffrey F
a66bf72199 Match named volumes in service definitions with declared volumes 
Raise ConfigurationError for undeclared named volumes
Test new behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad
883227c4d8 Alias containers by short id 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Dimitar Bonev
5545c55ecc Network fields schema validation 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad
d399b7893f Add test for logs=False 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
 2016-01-26 11:52:22 +00:00
Aanand Prasad
b1ebf5ce17 Fix interactive run with networking 
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad
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
Aanand Prasad
513a6b35cc Fix scale when containers exit immediately 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad
cbec6f8834 Support links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Jure Žvelc
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Aanand Prasad
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
Aanand Prasad
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
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
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
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
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
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