docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2748 from schmunk42/master 

fixed documentation about traversing yml files
This commit is contained in:
Aanand Prasad 2016-01-26 17:20:40 +00:00
parent 4b84d088e0 5fe0b57e5c
commit bacc2b730e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/reference/docker-compose.md
View File

@ -85,12 +85,12 @@ stdin. When stdin is used all paths in the configuration are
relative to the current working directory. relative to the current working directory.
The `-f` flag is optional. If you don't provide this flag on the command line, The `-f` flag is optional. If you don't provide this flag on the command line,
Compose traverses the working directory and its subdirectories looking for a Compose traverses the working directory and its parent directories looking for a
`docker-compose.yml` and a `docker-compose.override.yml` file. You must `docker-compose.yml` and a `docker-compose.override.yml` file. You must
supply at least the `docker-compose.yml` file. If both files are present, supply at least the `docker-compose.yml` file. If both files are present on the
Compose combines the two files into a single configuration. The configuration same directory level, Compose combines the two files into a single configuration.
in the `docker-compose.override.yml` file is applied over and in addition to The configuration in the `docker-compose.override.yml` file is applied over and
the values in the `docker-compose.yml` file. in addition to the values in the `docker-compose.yml` file.
See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file). See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file).