5b32d32b2d
Merge pull request #2521 from jeanpralo/master
...
Add method to get more info about container status
2015-12-15 12:04:42 -08:00
c8f266b637
add restarting status for human_readable_state
...
Signed-off-by: Jean Praloran <jeanpralo@gmail.com>
2015-12-16 08:19:28 +13:00
a1217dc050
Merge pull request #2536 from dbonev/2345-incorrect-network-name
...
Incorrect network name shown in the log when no driver is specified
2015-12-11 14:39:36 -08:00
6d709caaa5
Fixes incorrect network name shown in the log when no driver is specified
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2015-12-11 10:14:01 +02:00
1d3aeaaae7
Ignore extra coverge files
...
These files are created because we run acceptance tests in a subprocess.
They have the process id in their name, so they wont be removed by the
normal coverage cleanup on each run.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-10 15:29:36 -08:00
bc09698897
Merge pull request #2527 from dnephin/fix_dns_config_option
...
Fix dns and dns_search when used strings and without extends.
2015-12-10 11:31:01 +00:00
fa3528ea25
Fix dns and dns_search when used strings and without extends.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-09 16:32:39 -08:00
6fe747e0ee
Merge pull request #2522 from sdurrheimer/zsh-completion-config-cmd
...
Add zsh completion for config subcommand
2015-12-09 10:40:44 -08:00
0b7a407055
Merge pull request #2519 from seguins/clean_service
...
Remove unused functions in service
2015-12-09 13:51:27 +00:00
67829f08b6
Merge pull request #2518 from albers/completion-config
...
Add bash completion for config subcommand
2015-12-09 12:43:41 +00:00
01bba5ea23
Add zsh completion for config subcommand
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-12-09 08:57:14 +01:00
999d15b225
Remove unused functions in service
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2015-12-08 21:11:05 +01:00
a5b48a3dc2
Add bash completion for config subcommand
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-08 10:23:55 -08:00
dc39b01e00
Merge pull request #2512 from albers/completion-url
...
Use more robust download URL for completions
2015-12-08 16:27:09 +00:00
53cc99a822
Merge pull request #2513 from punkstar/detect-tty
...
Only allocate a tty if we detect one
2015-12-08 15:26:46 +00:00
82dfd465a2
Merge pull request #2407 from dnephin/config_command
...
New `docker-compose config` command
2015-12-08 15:16:48 +00:00
437f3f8adb
Add docker-compose config subcommand.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-07 18:51:01 -08:00
ecf2dd11f9
Merge pull request #2467 from dnephin/remove_migrate_to_labels
...
Remove migrate-to-labels.
2015-12-07 14:31:23 +00:00
9f4e83e456
Merge pull request #2466 from dnephin/remove_insecure_ssl_warning
...
Removes the deprecated --allow-insecure-ssl flag
2015-12-07 14:29:33 +00:00
50dcb1d7e7
Merge pull request #2468 from dnephin/increase_timeout_in_tests
...
Increase timeout in tests
2015-12-07 14:29:08 +00:00
f2c232bb10
Only allocate a tty if we detect one
...
Signed-off-by: Nick Jones <nick@nicksays.co.uk>
2015-12-07 09:56:28 +00:00
2525752a05
Use more robust download URL for completions
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-07 09:10:19 +01:00
509059cdab
Merge pull request #2492 from jake-low/no-yaml-warning
...
Stop warning about ".yaml" file extension
2015-12-04 12:22:56 -08:00
3e7b2ab865
Merge pull request #2506 from dnephin/update_changelog
...
Cherry-pick release notes for 1.5.2
2015-12-04 12:21:27 -08:00
de4a18ea6c
Cherry-pick release notes for 1.5.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-04 10:26:20 -08:00
0a84833474
Merge pull request #2505 from thaJeztah/update-maintainers
...
update maintainers file for parsing
2015-12-04 16:16:09 +00:00
7698da57ca
update maintainers file for parsing
...
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 16:52:29 +01:00
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
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
Daniel Nephin
Jean Praloran
Dimitar Bonev
Daniel Nephin
Aanand Prasad
Steve Durrheimer
Stéphane Seguin
Harald Albers
Nick Jones
Sebastiaan van Stijn
jake-low
moxiegirl
Jonas Eckerström
Sven Dowideit