tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-05-08 16:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,559 Commits 21 Branches 271 Tags
Commit Graph

149 Commits

Author SHA1 Message Date
Jesus
6bfb23baaa Display containers name when scale a container 
Display in the log output the name of those containers created using the scale command and
change the test_scale_with_api_error test to support the containers name when scale

Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2016-02-29 20:19:03 +01:00
Aanand Prasad
adb8de367e Merge pull request #2388 from dnephin/fix_long_lines 
Wrap long lines
 2016-02-25 16:52:33 -08:00
Daniel Nephin
43ecf8793a Address old TODO, and small refactor of container name logic in service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:19:38 -08:00
Daniel Nephin
d451578152 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:14:59 -08:00
Daniel Nephin
4b04280db8 Revert "Change special case from '_', None to ()" 
This reverts commit 677c50650c86b4b6fabbc21e18165f2117022bbe.

Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior"

This reverts commit 001903771260069c475738efbbcb830dd9cf8227.

Revert "Mangle the tests. They pass for better or worse!"

This reverts commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d.

Revert "If an env var is passthrough but not defined on the host don't set it."

This reverts commit 6540efb3d380e7ae50dd94493a43382f31e1e004.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:13:57 -08:00
Daniel Nephin
4a09da43ea Fix copying of volumes by using the name of the volume instead of the host path. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 13:34:14 -05:00
Daniel Nephin
740329a131 Shm_size requires docker 1.10. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-11 13:50:23 -05:00
Spencer Rinehart
5e6dc3521c Add support for shm_size. Fixes #2823. 
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22).  This requires docker-py 1.8.0
(docker/docker-py#923).

Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).

Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-10 15:25:18 -06:00
Joffrey F
fdf4a2e89e Merge pull request #2734 from jrabbit/empty-env-var-2359 
Empty env var #2359
 2016-02-08 11:17:54 -08:00
Daniel Nephin
57fc85b457 Wrap long lines and restrict lines to 105 characters. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-04 19:05:39 -05:00
Daniel Nephin
883e45626f Merge pull request #2706 from dnephin/dont_copy_host_volumes 
Don't copy host volumes on recreate
 2016-01-28 15:02:53 -05:00
Aanand Prasad
ed1b204804 Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:55:20 +00:00
jrabbit
0019037712 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-01-24 15:25:06 -05:00
Aanand Prasad
755c49b500 Fix scale when containers exit immediately 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 15:19:55 +00:00
Daniel Nephin
c39489f540 Don't copy over volumes that were previously host volumes, and are now container volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 14:41:21 -05:00
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
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
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
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
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
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
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
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
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
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
2ab3cb212a Add integration test and docs for build with a git url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-26 11:32:39 -05:00
Daniel Nephin
dac75b07dc Move volume parsing to config.types module 
This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -05:00
Daniel Nephin
efec2aae6c Fixes #2008 - re-use list_or_dict schema for all the types 
At the same time, moves extra_hosts validation to the config module.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:31:58 -05:00
Daniel Nephin
12b82a20ff Move restart spec to the config.types module. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:31:58 -05:00
Daniel Nephin
068edfa313 Move parsing of volumes_from to the last step of config parsing. 
Includes creating a new compose.config.types module for all the domain objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:31:58 -05:00
Daniel Nephin
d1adbb9b25 Refactor parallel_execute. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:09:51 -05:00
Daniel Nephin
76f3c9c739 Merge pull request #2349 from dnephin/validate_all_files 
Validate all files before merging them
 2015-11-11 15:27:47 -05:00
Daniel Nephin
a92d86308f Rename ServiceLoader to ServiceExtendsResolver 
ServiceLoader has evolved to be not really all that related to "loading" a
service. It's responsibility is more to do with handling the `extends`
field, which is only part of loading.  The class and its primary method
(make_service_dict()) were renamed to better reflect their responsibility.

As part of that change process_container_options() was removed from
make_service_dict() and renamed to process_service().  It contains logic for
handling the non-extends options.

This change allows us to remove the hacks from testcase.py and only call
the functions we need to format a service dict correctly for integration tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-11 10:58:07 -05:00
Daniel Nephin
a8ac6e6f93 Add a warning when the host volume config is being ignored. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:48:53 -05:00
Daniel Nephin
ce322047a0 Move config hash tests to service_test.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin
3d9e3d0877 Remove service.start_container() 
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 10:17:09 -05:00
Daniel Nephin
a71d9af522 Disable a test against docker 1.8.3 because it fails due to a bug in docker engine. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 17:54:38 -04:00
Mazz Mosley
bee063c07d Fix tests 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Aanand Prasad
627f1acdc4 Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from 
1188 support ro options in volumes from
 2015-10-07 11:57:14 +01:00
Mazz Mosley
467c731869 address PR feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Vincent Demeester
5b55a08846 Add support for ro option in volumes_from 
Fixes #1188

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-06 13:12:55 +01:00