Merge pull request #1269 from francoisfaubert/master

Clarified how to split multiple docker-compose files on Windows
This commit is contained in:
Mahmoud Zalt 2017-12-04 08:35:01 +01:00 committed by GitHub
commit ba61566f28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

View File

@ -162,6 +162,7 @@ cp env-example .env
You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used. You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.
Depending on the host's operating system you may need to change the value given to `COMPOSE_FILE`. When you are running Laradock on Mac OS the correct file separator to use is `:`. When running Laradock from a Windows environment multiple files must be separated with `;`.
2 - Build the enviroment and run it using `docker-compose` 2 - Build the enviroment and run it using `docker-compose`

View File

@ -25,6 +25,7 @@ DATA_SAVE_PATH=~/.laradock/data
### Docker compose files ############################################################################################### ### Docker compose files ###############################################################################################
# Select which docker-compose files to include. # Select which docker-compose files to include.
# If using docker-sync. Set the value to: docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml # If using docker-sync. Set the value to: docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
# Change the separator from : to ; on Windows
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml