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

edit docker-compose.yml variables to support the new LaraDock structure

This commit is contained in:
Mahmoud Zalt 2016-02-17 17:51:23 +02:00
parent 7e49f6708e
commit e572b0b9e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker-compose.yml
View File

@ -10,14 +10,14 @@ php-nginx:
- "80:80" - "80:80"
volumes: volumes:
- ./settings/nginx:/etc/nginx/sites-available - ./settings/nginx:/etc/nginx/sites-available
- ../laravel:/var/www - ../:/var/www
- ./logs/nginx:/var/log/nginx - ./logs/nginx:/var/log/nginx
links: links:
- mysql - mysql
- redis - redis
privileged: true privileged: true
# extra_hosts: extra_hosts:
# - "laravel.dev:xxx.xxx.xxx.xxx" - "laravel.dev:xxx.xxx.xxx.xxx"
# MySQL Container #---------------------------------------- # MySQL Container #----------------------------------------
mysql: mysql:
@ -28,9 +28,9 @@ mysql:
volumes_from: volumes_from:
- data - data
environment: environment:
MYSQL_DATABASE: laravel-database MYSQL_DATABASE: homestead
MYSQL_USER: root MYSQL_USER: homestead
MYSQL_PASSWORD: pass MYSQL_PASSWORD: secret
privileged: true privileged: true
# Redis Container #---------------------------------------- # Redis Container #----------------------------------------