Merge pull request #16 from laradock/master

Just update the fork

.env

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

.gitignore

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

README-zh.md

@@ -469,7 +469,7 @@ composer create-project laravel/laravel my-cool-app "5.2.*"
 系统默认LaraDock假定Laravel应用在LaraDock的父级目录中
 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
     application:

docker-compose.yml

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

selenium/Dockerfile

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