Merge pull request #1265 from jeff-h/master1
Specifying included docker-compose files in the .env is more flexible
This commit is contained in:
commit
9b8d4806a8
@ -7,6 +7,9 @@
|
|||||||
|
|
||||||
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
|
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 ###################################################################################################
|
### Application Path ###################################################################################################
|
||||||
# Point to your code, will be available at `/var/www`.
|
# Point to your code, will be available at `/var/www`.
|
||||||
|
|
||||||
|
2
sync.sh
2
sync.sh
@ -59,7 +59,7 @@ if [ "$1" == "up" ] ; then
|
|||||||
|
|
||||||
print_style "Initializing Docker Compose\n" "info"
|
print_style "Initializing Docker Compose\n" "info"
|
||||||
shift # removing first argument
|
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
|
elif [ "$1" == "down" ]; then
|
||||||
print_style "Stopping Docker Compose\n" "info"
|
print_style "Stopping Docker Compose\n" "info"
|
||||||
|
Loading…
Reference in New Issue
Block a user