Merge branch 'master' into master

docker-compose.yml

@@ -15,7 +15,7 @@ services:
     workspace:
         build:
             context: ./workspace
-            args:
+            args:              
               - INSTALL_XDEBUG=false
               - INSTALL_SOAP=false
               - INSTALL_MONGO=false
@@ -120,6 +120,18 @@ services:
         links:
           - workspace
 
+### Minio Container #########################################
+
+    minio:
+        build: ./minio
+        volumes:
+            - minio:/export
+        ports:
+          - "9000:9000"
+        environment:
+          MINIO_ACCESS_KEY: access
+          MINIO_SECRET_KEY: secretkey
+
 ### MySQL Container #########################################
 
     mysql:
@@ -336,6 +348,9 @@ services:
         build: ./selenium
         ports:
           - "4444:4444"
+        volumes:
+          # see https://github.com/SeleniumHQ/docker-selenium#running-the-images
+          - /dev/shm:/dev/shm
 
 ### Volumes Setup ###########################################
 
@@ -354,6 +369,8 @@ volumes:
         driver: "local"
     mongo:
         driver: "local"
+    minio:
+        driver: "local"
     rethinkdb:
         driver: "local"
     phpmyadmin: