Merge pull request #16 from laradock/master

Just update the fork
This commit is contained in:
Luciano Jr 2017-01-09 17:46:36 +00:00 committed by GitHub
commit bd87a26db1
6 changed files with 611 additions and 380 deletions

1
.env Normal file
View File

@ -0,0 +1 @@
COMPOSE_CONVERT_WINDOWS_PATHS=1

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
.idea .idea
/logs /logs
/data /data
.env

View File

@ -469,7 +469,7 @@ composer create-project laravel/laravel my-cool-app "5.2.*"
系统默认LaraDock假定Laravel应用在LaraDock的父级目录中 系统默认LaraDock假定Laravel应用在LaraDock的父级目录中
By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder. By default LaraDock assumes the Laravel application is living in the parent directory of the laradock folder.
新Laravel应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下: 新Laravel应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
```yaml ```yaml
application: application:

975
README.md

File diff suppressed because it is too large Load Diff

View File

@ -324,6 +324,13 @@ services:
links: links:
- php-fpm - php-fpm
### Selenium Container #########################################
selenium:
build: ./selenium
ports:
- "4444:4444"
### Volumes Setup ########################################### ### Volumes Setup ###########################################
volumes: volumes:

5
selenium/Dockerfile Normal file
View File

@ -0,0 +1,5 @@
FROM selenium/standalone-chrome
MAINTAINER Edmund Luong <edmundvmluong@gmail.com>
EXPOSE 4444