ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1265 from jeff-h/master1 

Specifying included docker-compose files in the .env is more flexible
This commit is contained in:
Mahmoud Zalt 2017-11-22 20:15:07 +02:00 committed by GitHub
parent 65a8bbc6a4 73b95357ac
commit 9b8d4806a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
env-example
View File

@ -7,6 +7,9 @@
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
# Replace the above with the following line if you wish to use docker-sync.
# COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
### Application Path ###################################################################################################
# Point to your code, will be available at `/var/www`.

2
sync.sh
View File

@ -59,7 +59,7 @@ if [ "$1" == "up" ] ; then
print_style "Initializing Docker Compose\n" "info"
shift # removing first argument
docker-compose -f docker-compose.yml -f docker-compose.sync.yml up -d ${@}
docker-compose up -d ${@}
elif [ "$1" == "down" ]; then
print_style "Stopping Docker Compose\n" "info"