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

2016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
08bd2a318f Merge pull request #2371 from shin-/yvespp-master 
Removed unneeded newlines on docker-compose pull with no tty (#2311 update)
 2015-11-11 15:20:31 -05:00
Joffrey F
c573fcc70a Reorganize conditional branches to improve readability 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-11 11:21:24 -08:00
Yves Peter
b8b4c84573 Fixes #1490 
progress_stream would print a lot of new lines on "docker-compose pull" if there's no tty.

Signed-off-by: Yves Peter <ypdraw@gmail.com>
 2015-11-11 11:20:59 -08:00
Aanand Prasad
2063b39868 Merge pull request #2336 from dnephin/warn_on_volume_masking 
Add a warning when the host volume in the compose file is masked by a data volume
 2015-11-11 17:21:29 +00:00
Daniel Nephin
5e97b806d5 Fix a bug in ExtendsResolver where the service name of the extended service was wrong. 
This bug can be seen by the change to the test case. When the extended service
uses a different name, the error was reported incorrectly.

By fixing this bug we can simplify self.signature and self.detect_cycles to
always use self.service_name.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-11 10:58:07 -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
98ad5a05e4 Validate additional files before merging them. 
Consolidates all the top level config handling into `process_config_file` which
is now used for both files and merge sources.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-11 10:56:15 -05:00
Aanand Prasad
7466d14826 Merge pull request #2363 from dnephin/pr-2261 
Rebase of PR 2261
 2015-11-11 15:48:28 +00:00
Daniel Nephin
c006c6ea09 Merge pull request #2341 from dnephin/dont_create_default_network_sometimes 
Only create the default network if at least one service needs it
 2015-11-11 10:48:08 -05:00
Daniel Nephin
7365a398b3 Update doc wording for ulimits. 
and move tests to the correct module

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 15:03:20 -05:00
Kevin Greene
22d90d2180 Added ulimits functionality to docker compose 
Signed-off-by: Kevin Greene <kevin@spantree.net>
 2015-11-10 14:07:04 -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
7d6c63d1b7 Merge pull request #2361 from dnephin/pr-2262 
Rebase of PR 2262
 2015-11-10 13:42:08 -05:00
Joffrey F
2c2b8a8322 Merge pull request #2360 from shin-/2357-http_timeout_exit_1 
Use exit code 1 when encountering a ReadTimeout
 2015-11-10 10:31:58 -08:00
Daniel Nephin
338bbb5063 Re-order flags in bash completion 
and remove unnecessary variables from build command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:11:59 -05:00
Joffrey F
133d213e78 Use exit code 1 when encountering a ReadTimeout 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-10 10:11:20 -08:00
Adrian Budau
c5c36d8b00 Added --force-rm to compose build. 
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
 2015-11-10 13:05:04 -05:00
Daniel Nephin
45724fc667 Only create the default network if at least one service needs it. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 12:43:55 -05:00
Daniel Nephin
3474bb6cf5 Cleanup workaround in testcase.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 12:43:55 -05:00
Aanand Prasad
0017f43d7f Merge pull request #2339 from dnephin/recreate_deps_on_create 
Recreate dependents when a dependency is created
 2015-11-10 17:36:23 +00:00
Daniel Nephin
c8fa0a902a Merge pull request #2331 from dnephin/flush_log_buffer_when_printing_logs 
Flush the log stream after writing each line
 2015-11-10 12:34:42 -05:00
Aanand Prasad
917b885a44 Merge pull request #2334 from dnephin/dont_set_hostname 
Don't set the hostname to the service name with networking.
 2015-11-10 17:34:02 +00:00
Daniel Nephin
b09cf86dd6 Merge pull request #2326 from dnephin/unicode_decode_error 
Unicode decode error
 2015-11-10 12:29:52 -05:00
Joffrey F
774d852f93 Merge pull request #2335 from dnephin/volumes_refactoring 
Some small refactoring around volumes
 2015-11-09 14:05:52 -08:00
Daniel Nephin
e5fbf35ce1 Merge pull request #2351 from shin-/2322_config_hash_volumes_from 
Update service config_dict computation to include volumes_from mode
 2015-11-09 16:26:47 -05:00
Joffrey F
a1e140f5a3 Update service config_dict computation to include volumes_from mode 
Ensure config_hash is updated when volumes_from mode is changed, and
service is recreated on next up as a result.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-09 13:07:26 -08:00
Daniel Nephin
b7fe86b99a Merge pull request #2348 from aanand/fix-parallel-output 
Fix parallel output
 2015-11-09 13:09:50 -05:00
Aanand Prasad
1bfb710326 Fix parallel output 
We were outputting an extra line, which in *some* cases, on *some*
terminals, was causing the output of parallel actions to get messed up.

In particular, it would happen when the terminal had just been cleared
or hadn't yet filled up with a screen's worth of text.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-09 17:24:21 +00:00
Daniel Nephin
7c2a16234f Recreate dependents when a dependency is created (not just when it's recreated). 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-06 12:29:52 -05:00
Daniel Nephin
ec22d98377 Use VolumeSpec instead of re-parsing the volume string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 18:11:56 -05:00
Daniel Nephin
0e19c92e82 Make working_dir consistent in the config package. 
- make it a positional arg, since it's required
- make it the first argument for all functions that require it
- remove an unnecessary one-line function that was only called in one place

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 18:11:56 -05:00
Daniel Nephin
3456002aef Don't set the hostname to the service name with networking. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 17:50:32 -05:00
Daniel Nephin
d32bb8efee Fix #1549 - flush after each line of logs. 
Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 15:33:42 -05:00
Daniel Nephin
26c7dd3712 Handle non-utf8 unicode without raising an error. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 12:56:36 -05:00
Aanand Prasad
67dc90ec0e Merge pull request #2314 from dnephin/fix_up_require_build_error 
Fix `up` "requires build" error
 2015-11-05 15:52:56 +00:00
Aanand Prasad
97dee9d54a Merge pull request #2310 from dnephin/update_release_notes 
Update release notes
 2015-11-05 15:52:41 +00:00
Daniel Nephin
8ff960afd1 Fix service recreate when image changes to build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -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
0227b3adbd Upgrade pyyaml to 3.11 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:26:54 -05:00
Daniel Nephin
d18ad4c812 Fix rebase-bump-commit script when used with a final release. 
Previously it would find commits for RC releases, which broke the rebase.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:25:46 -05:00
Daniel Nephin
6b002fb922 Cherry-pick release notes froim 1.5.0 
And bump version to 1.6.0dev

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:25:46 -05:00
Daniel Nephin
50f06c6ba2 Merge pull request #2325 from dnephin/fix_jenkins_build 
Fix jenkins CI
 2015-11-04 17:25:17 -05:00
Daniel Nephin
385b4280a1 Fix jenkins CI by using an older docker version to match the host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-04 15:33:37 -05:00
Aanand Prasad
6a8806fe8d Merge pull request #2304 from dnephin/remove_start_container 
Remove service.start_container()
 2015-11-04 10:19:33 +00:00
Aanand Prasad
4ebe68e612 Merge pull request #2290 from dnephin/docs_multi_file_compose 
Docs for using multiple compose files
 2015-11-03 17:14:57 +00:00
Daniel Nephin
e503e085ac Re-order extends docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:52:44 -05:00
Daniel Nephin
8bdde9a731 Replace composition with Compose app. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Daniel Nephin
eab265befa Document using multiple Compose files use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Daniel Nephin
c5cf5cfad4 Changes to production.md for working with multiple Compose files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00