Updated with laradock master

2017-03-08 16:08:42 +01:00
parent 25c2768557 94c6240586
commit 7a343f168f
8 changed files with 103 additions and 5 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -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: