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

2629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
8f48fa4747 Merge pull request #2491 from dnephin/bump-1.5.2 
WIP: Bump 1.5.2
 2015-12-03 17:11:51 -08:00
Daniel Nephin
7240ff35ee Bump 1.5.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.5.2 		2015-12-03 11:18:32 -08:00
Daniel Nephin
aaf66e3485 FAQ document for Compose 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-03 11:05:06 -08:00
Aanand Prasad
96f4a42a35 Validate the 'expose' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad
e6fbca42a1 Split out ports validation tests into type, uniqueness, format 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad
527bf3b023 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-12-03 11:05:05 -08:00
Aanand Prasad
ab36c9c6cd Refactor ports section of fields schema 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-03 11:05:05 -08:00
Aanand Prasad
e67419065a 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-12-03 11:05:05 -08:00
Daniel Nephin
69e956ce8b Add integration test and docs for build with a git url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-03 11:05:05 -08:00
Jonas Eckerström
0dbd99bad2 Added support for url buid paths 
Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>
 2015-12-03 11:05:05 -08:00
Daniel Nephin
fa975d7fbe 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-12-03 11:05:01 -08:00
jake-low
e760c42ae0 Stop warning about ".yaml" extension 
".yaml" is the preferred extension according to http://www.yaml.org/faq.html

Signed-off-by: jake-low <jakelow42@gmail.com>
 2015-12-02 21:45:36 -08:00
Daniel Nephin
81f0e72bd2 Move service sorting to config package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
da27f8e7e2 Remove unnecessary intermediate variables in get_container_host_config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
8572d50903 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-12-02 17:31:48 -08:00
Daniel Nephin
5d39813e1b 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-12-02 17:31:48 -08:00
Daniel Nephin
b19315b57e Move restart spec to the config.types module. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
e549875e89 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-12-02 17:31:48 -08:00
Daniel Nephin
7e21b05f05 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-12-02 17:31:48 -08:00
Daniel Nephin
bea2072b95 Add the git sha to version output 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
3b6cc7a7bb Add missing assert and autospec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
a264470cc0 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-12-02 17:31:48 -08:00
Daniel Nephin
844e2c3d26 Fix use case link in readme. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
210a14cf28 Add note about required pip version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Brandon Burton
9ce4024951 Fixing matrix include so os: linux goes to trusty 
Signed-off-by: Brandon Burton <brandon@inatree.org>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
8fb6fb7b19 Fix env_file and environment when used with extends. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
83760d0e9e Handle both SIGINT and SIGTERM for docker-compose run. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
be5b7b6f0e Handle both SIGINT and SIGTERM for docker-compose up. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
e5a02d3052 Fix extra warnings on masked volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Stéphane Seguin
3a395892fc Fix restart with stopped containers. Fixes #1814 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
09f6a876cf 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-12-02 17:31:48 -08:00
Stefan Scherer
0117148a36 Use uname to build target name for different platforms 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-12-02 17:31:48 -08:00
Simon van der Veldt
8f70c8cdeb 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-12-02 17:31:48 -08:00
Daniel Nephin
16a74f3797 Fix texttable dep. 0.8.2 was removed from pypi. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 17:31:48 -08:00
Viranch Mehta
c42918ec7c Fix specifies_host_port() to handle port binding with host IP but no host port 
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
 2015-12-02 17:31:48 -08:00
Mazz Mosley
d28b2027b8 Clarify dockerfile requires build key 
Credit to @funkyfuture for the first PR addressing the clarification.
https://github.com/docker/compose/pull/1767

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-12-02 17:31:48 -08:00
Mazz Mosley
8d816fc2f3 Add cross references for env/cli 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-12-02 17:31:48 -08:00
Daniel Nephin
f476436027 Merge remote-tracking branch 'docker/release' into bump-1.5.2 2015-12-02 16:56:55 -08:00
Daniel Nephin
707281aadb Merge pull request #2291 from dnephin/compose_faq 
FAQ document for Compose
 2015-12-02 11:12:37 -08:00
Daniel Nephin
3f39ffe72e FAQ document for Compose 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-02 10:47:32 -08:00
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
Daniel Nephin
377f084dfe Increase timeout in tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 13:54:00 -05:00
Daniel Nephin
a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00
Daniel Nephin
2f568984f7 Fixes #2368, removes the deprecated --allow-insecure-ssl flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 11:52:25 -05: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