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
bea2072b95
Add the git sha to version output
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
3b6cc7a7bb
Add missing assert and autospec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
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
844e2c3d26
Fix use case link in readme.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
210a14cf28
Add note about required pip version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
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
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
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
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
e5a02d3052
Fix extra warnings on masked volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
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
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
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
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
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
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
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
8d816fc2f3
Add cross references for env/cli
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-12-02 17:31:48 -08:00
f476436027
Merge remote-tracking branch 'docker/release' into bump-1.5.2
2015-12-02 16:56:55 -08:00
707281aadb
Merge pull request #2291 from dnephin/compose_faq
...
FAQ document for Compose
2015-12-02 11:12:37 -08:00
3f39ffe72e
FAQ document for Compose
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 10:47:32 -08:00
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
377f084dfe
Increase timeout in tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-27 13:54:00 -05:00
a21f9993b3
Remove migrate-to-labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-27 12:04:45 -05:00
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
defcf5a21f
Merge pull request #2464 from aanand/validate-expose
...
Validate `expose`
2015-11-27 14:44:55 +00:00
ccf548b98c
Validate the 'expose' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-11-26 19:27:32 +00:00
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
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
d52508e2b1
Refactor ports section of fields schema
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-11-26 18:52:14 +00:00
0fedd9969f
Merge pull request #2430 from dnephin/build_from_url
...
Build from url
2015-11-26 18:15:03 +00:00
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
f7239f41ef
Added support for url buid paths
...
Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>
2015-11-26 11:29:07 -05:00
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
fd06d699f2
Use FROM docs/base:latest again
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-26 20:30:12 +10:00
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
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
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
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
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
c1c1dceb59
Merge pull request #2453 from dnephin/fix_test_assertion
...
Add missing assert and autospec
2015-11-24 16:45:04 +00:00
88e9c1ccd9
Merge pull request #2438 from dnephin/fix_flaky_pull_test
...
Fix `build --pull` test flakes
2015-11-24 16:44:53 +00:00
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
e40670207f
Add missing assert and autospec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-24 10:42:25 -05:00
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
533f33271a
Move service sorting to config package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:33:00 -05:00
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
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
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
Brandon Burton
Stéphane Seguin
Stefan Scherer
Simon van der Veldt
Viranch Mehta
Mazz Mosley
Daniel Nephin
moxiegirl
Aanand Prasad
Jonas Eckerström
Sven Dowideit