tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,073 Commits 24 Branches 268 Tags
Commit Graph

2073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
e67bc2569c Properly resolve environment from all sources. 
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-25 11:02:20 -05:00
Aanand Prasad
cfb1b37da2 Merge pull request #2405 from dnephin/move_all_validation_to_config 
Move all validation to config
 2015-11-25 15:16:21 +00:00
Daniel Nephin
8930fa25d6 Merge pull request #2387 from dnephin/update_release_notes 
cherry-pick release notes from 1.5.1
 2015-11-24 13:25:21 -05:00
Daniel Nephin
6e89a5708f cherry-pick release notes from 1.5.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-24 13:24:46 -05:00
Aanand Prasad
c1c1dceb59 Merge pull request #2453 from dnephin/fix_test_assertion 
Add missing assert and autospec
 2015-11-24 16:45:04 +00:00
Aanand Prasad
88e9c1ccd9 Merge pull request #2438 from dnephin/fix_flaky_pull_test 
Fix `build --pull` test flakes
 2015-11-24 16:44:53 +00:00
Aanand Prasad
689f040c97 Merge pull request #2429 from dnephin/fix_links_in_readme 
Fix use case link in readme
 2015-11-24 15:56:05 +00:00
Daniel Nephin
e40670207f Add missing assert and autospec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-24 10:42:25 -05:00
Aanand Prasad
50bc734492 Merge pull request #2427 from dnephin/note_about_pip_version 
Add note about required pip version.
 2015-11-24 15:21:37 +00:00
Daniel Nephin
533f33271a Move service sorting to config package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -05:00
Daniel Nephin
effa9834a5 Remove unnecessary intermediate variables in get_container_host_config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -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
c9ca5e86b0 Remove project name validation 
project name is already normalized to a valid name before creating a service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:30:54 -05:00
Aanand Prasad
83ddec8df7 Merge pull request #2439 from solarce/sol-matrix-trusty-fix 
Fixing matrix include so `os: linux` goes to trusty
 2015-11-23 18:01:22 +00:00
Aanand Prasad
665de9a494 Merge pull request #2436 from dnephin/reduce_cyclomatic_complexity 
Reduce cyclomatic complexity
 2015-11-23 17:51:54 +00:00
Daniel Nephin
b4edf0c454 Move parallel_execute to a new module. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 11:34:48 -05:00
Aanand Prasad
aafacd3495 Merge pull request #2418 from dnephin/fix_env_with_extends 
Fix env_file and environment when used with extends
 2015-11-23 14:48:04 +00:00
Brandon Burton
13081d4516 Fixing matrix include so os: linux goes to trusty 
Signed-off-by: Brandon Burton <brandon@inatree.org>
 2015-11-20 16:07:37 -08:00
Daniel Nephin
2351e11cc8 Make sure we always have the latest busybox image, so that build --pull tests don't flake. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:51:36 -05:00
Daniel Nephin
64447879d2 Reduce complexity of merge_service_dicts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:09:55 -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
c4096525c2 Merge pull request #2364 from dnephin/handle_signals_properly 
Handle SIGTERM/SIGINT properly for up and run
 2015-11-20 11:58:04 -05:00
Daniel Nephin
8bc84c74e7 Merge pull request #2417 from dnephin/inlude_git_sha_in_version 
Add the git sha to version output
 2015-11-20 11:39:38 -05:00
Daniel Nephin
331450dace Merge pull request #2390 from dnephin/fix_extra_warnings_on_masked_volumes 
Fix extra warnings on masked volumes
 2015-11-20 11:37:54 -05:00
Daniel Nephin
91fb6156c6 Merge pull request #2393 from seguins/1814-restart-stopped-containers 
Fix restart with stopped containers.
 2015-11-20 11:35:24 -05:00
Daniel Nephin
46446111e5 Merge pull request #2400 from dnephin/fix_stream_with_empty_object 
Fix a bug in progress_stream when an `ADD <url>` was used
 2015-11-20 11:33:45 -05:00
Daniel Nephin
6224b6edd9 Fix use case link in readme. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-19 14:53:28 -05:00
Joffrey F
dd1a2b36fa Merge pull request #2389 from hypriot/use-uname-for-target 
Use uname to build target name for different platforms
 2015-11-19 10:36:33 -08:00
Joffrey F
449cdcc966 Merge pull request #2420 from simonvanderveldt/fix-script-runsh-env-vars 
run.sh script: Also pass DOCKER_TLS_VERIFY and DOCKER_CERT_PATH env vars to compose container
 2015-11-19 10:35:28 -08:00
Daniel Nephin
3fdf0f43be Add note about required pip version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-19 12:55:03 -05:00
Daniel Nephin
21a72e350b Merge pull request #2413 from SvenDowideit/stop-docs-validation-errors 
2 small changes to clear up docs-validation complaints
 2015-11-19 12:52:43 -05:00
Sven Dowideit
acf31181e8 Some small changes to clear up docs-validation complaints 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-19 13:35:09 +10:00
Daniel Nephin
1e8f76767f Fix env_file and environment when used with extends. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-18 16:07:11 -05:00
Daniel Nephin
c78c32c2e8 Fixes #2398 - the build progress stream can contain empty json objects. 
Previously these empty objects would hit a bug in splitting objects causing it crash.
With this fix the empty objects are returned properly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-18 16:04:41 -05:00
Simon van der Veldt
efbfa9e38f run.sh script: Also pass DOCKER_TLS_VERIFY and DOCKER_CERT_PATH 
env vars to compose container

Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2015-11-18 21:40:16 +01:00
Daniel Nephin
d4b9845201 Add the git sha to version output 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-18 13:21:14 -05:00
Daniel Nephin
2f20dfe508 Merge pull request #2409 from dnephin/fix_the_build 
Fix texttable dep. 0.8.2 was removed from pypi.
 2015-11-17 20:06:40 -05:00
Daniel Nephin
265828f4eb Fix texttable dep. 0.8.2 was removed from pypi. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-17 18:36:58 -05:00
Stéphane Seguin
61f91ebff7 Fix restart with stopped containers. 
Fixes #1814

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-11-14 12:23:23 +01:00
Daniel Nephin
e1308a8329 Fix extra warnings on masked volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-13 10:49:17 -05:00
Stefan Scherer
c99f2f8efd Use uname to build target name for different platforms 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-11-13 08:33:51 +01:00
Daniel Nephin
6236bb0019 Handle both SIGINT and SIGTERM for docker-compose run. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 17:41:44 -05:00
Daniel Nephin
ea4230e7a2 Handle both SIGINT and SIGTERM for docker-compose up. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 17:41:44 -05:00
Daniel Nephin
9f6a5a964a Merge pull request #2355 from dnephin/refactor_handle_error 
Refactor process_error and include a filename as part of the validation error messages
 2015-11-12 15:01:32 -05:00
Daniel Nephin
9c305ac10f Remove name field from the list of ALLOWED_KEYS 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 13:26:13 -05:00
Daniel Nephin
589755d034 Inclide the filename in validation errors. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 12:44:45 -05:00
Daniel Nephin
fa96484d28 Refactor process_errors into smaller functions 
So that it passed new max-complexity requirement

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 12:44:24 -05:00