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>

Fix env_file overrides with extends

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

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>

Signed-off-by: Jonas Eckerström <jonaseck@gmail.com>

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Build from url

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

- 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>

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Validate `expose`

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Signed-off-by: Daniel Nephin <dnephin@docker.com>

…test

Use FROM docs/base:latest again

Signed-off-by: Daniel Nephin <dnephin@docker.com>

FAQ document for Compose

".yaml" is the preferred extension according to http://www.yaml.org/faq.html

Signed-off-by: jake-low <jakelow42@gmail.com>

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>

update maintainers file for parsing

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Cherry-pick release notes for 1.5.2

Stop warning about ".yaml" file extension

Signed-off-by: Harald Albers <github@albersweb.de>

Signed-off-by: Nick Jones <nick@nicksays.co.uk>

Increase timeout in tests

Removes the deprecated --allow-insecure-ssl flag

Remove migrate-to-labels.

Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>