|
|
@@ -85,12 +85,12 @@ stdin. When stdin is used all paths in the configuration are
|
|
|
relative to the current working directory.
|
|
|
|
|
|
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
|
|
|
-supply at least the `docker-compose.yml` file. If both files are present,
|
|
|
-Compose combines the two files into a single configuration. The configuration
|
|
|
-in the `docker-compose.override.yml` file is applied over and in addition to
|
|
|
-the values in the `docker-compose.yml` file.
|
|
|
+supply at least the `docker-compose.yml` file. If both files are present on the
|
|
|
+same directory level, Compose combines the two files into a single configuration.
|
|
|
+The configuration in the `docker-compose.override.yml` file is applied over and
|
|
|
+in addition to the values in the `docker-compose.yml` file.
|
|
|
|
|
|
See also the `COMPOSE_FILE` [environment variable](overview.md#compose-file).
|
|
|
|