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

307 Commits

Author SHA1 Message Date
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
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
Aanand Prasad
ce0d469c18 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +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
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
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
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
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
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
237f134a00 Allow custom ipam config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 14:50:56 -05: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
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
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
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
69ed5f9c48 Specify networks in Compose file 
There's not yet a proper way for services to join networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:36 +00:00
Aanand Prasad
8fca4f1628 Merge pull request #2649 from dnephin/make_volumes_from_more_explicit 
Make volumes from more explicit in V2 config format
 2016-01-14 17:15:27 +00:00
Daniel Nephin
b76dc1e05e Require volumes_from a container to be explicit in V2 config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:16 -05:00
Daniel Nephin
c64af0a459 Add an acceptance test and docs for the down subcommand 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:11:08 -05:00
Aanand Prasad
7733600262 Merge pull request #2508 from jstewmon/stop_signal 
add support for stop_signal to compose file
 2016-01-14 12:46:04 +00:00
Joffrey F
d601199eb5 Normalize external_name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 12:07:08 -08:00
Joffrey F
f774422d18 Test Volume.exists() behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:58:24 -08:00
Joffrey F
9cb58b796e Implement ability to specify external volumes 
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:53:49 -08:00
Joffrey F
05935b5e54 Don't recreate pre-existing volumes. 
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 15:42:42 -08:00
Jonathan Stewmon
5d8c2d3cec add support for stop_signal to compose file 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-12 17:21:49 -06:00
Aanand Prasad
a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Aanand Prasad
1a66543461 Make the default network name '{project name}_default' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Aanand Prasad
b786b47bc8 Remove version checks from tests requiring API v1.21 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Daniel Nephin
e98ab0e534 Allow both image and build together. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:10:00 -05:00
Joffrey F
ca634649bb Changed logging override test into integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 16:25:19 -08:00
Dimitar Bonev
ed5f7bd394 log_driver and log_opt moved to logging key. 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-08 01:54:45 +02:00
Daniel Nephin
bf1552da79 Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:24 -05:00
Daniel Nephin
475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Joffrey F
a7689f3da8 Handle volume driver change error in config. 
Assume version=1 if file is empty in get_config_version
Empty files are invalid anyway, so this simplifies the algorithm
somewhat.
https://github.com/docker/compose/pull/2421#discussion_r47223144

Don't leak version considerations in interpolation/service validation

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:22:13 -08:00
Joffrey F
f3a9533dc0 version no longer optional arg for process_config_file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:54 -08:00
Joffrey F
ec5111f1c2 Volumes are now prefixed with the project name 
When created through the compose file, volumes are prefixed
with the name of the project they belong to + underscore,
similarly to how containers are currently handled.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F
ecef5d37a7 Add v2 configuration tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F
b4be7b870f Add support for declaring named volumes in compose files 
* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
4bf2f8c4f9 Fix lookup of linked containers for API version 1.20 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
97fe2ee40c Don't preserve host volumes on container recreate. 
Fixes a regression after the API changed to use Mounts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
c64b7cbb10 Ignore errors from API about not being able to kill a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Joffrey F
3bdcc9d954 Update service tests to use mounts instead of volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
73de81b51c Upgrade tests to use new Mounts in container inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Aanand Prasad
a2d2915a64 Merge pull request #2547 from seguins/1125-docker-compose-create 
Add docker-compose create command.
 2015-12-21 14:20:56 +00:00
Stéphane Seguin
3c76d5a467 Add docker-compose create command. 
Closes #1125

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-18 08:53:26 +01:00
Dimitar Bonev
a542041264 Added support for cpu_quota flag 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-16 21:25:30 +02:00
Stéphane Seguin
999d15b225 Remove unused functions in service 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-08 21:11:05 +01:00
Daniel Nephin
a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00