tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,085 Commits 20 Branches 259 Tags 62 MiB
Commit Graph

2085 Commits

Author SHA1 Message Date
moxiegirl 0eba234c54 Merge pull request #2461 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-12-01 08:54:13 -08:00
Aanand Prasad defcf5a21f Merge pull request #2464 from aanand/validate-expose 
Validate `expose`
 2015-11-27 14:44:55 +00:00
Aanand Prasad ccf548b98c Validate the 'expose' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-26 19:27:32 +00:00
Aanand Prasad 042c7048f2 Split out ports validation tests into type, uniqueness, format 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-26 19:27:31 +00:00
Aanand Prasad 374b16843f Fix ports validation message 
- The `raises` kwarg to the `cls_check` decorator was being used
  incorrectly (it should be an exception class, not an object).

- We need to check for `error.cause` and get the message out of the
  exception object.

NB: The particular case where validation fails in the case of `ports` is
only when ranges don't match in length - no further validation is
currently performed client-side.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-26 18:54:30 +00:00
Aanand Prasad d52508e2b1 Refactor ports section of fields schema 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-26 18:52:14 +00:00
Aanand Prasad 0fedd9969f Merge pull request #2430 from dnephin/build_from_url 
Build from url
 2015-11-26 18:15:03 +00: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
Jonas Eckerström f7239f41ef Added support for url buid paths 
Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>
 2015-11-26 11:29:07 -05:00
Aanand Prasad b85bfce65e Fix ports validation test 
We were essentially only testing that *at least one* of the invalid
values fails the validation check, rather than that *all* of them fail.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-26 15:06:30 +00:00
Sven Dowideit fd06d699f2 Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-26 20:30:12 +10:00
Aanand Prasad 7b893164a4 Merge pull request #2450 from dnephin/fix_env_file_ordering 
Fix env_file overrides with extends
 2015-11-25 16:35:40 +00:00
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