Merge branch '4.6RC'4.6

1 files changed, 59 insertions, 0 deletions

diff --git a/vendor/blueimp/jquery-file-upload/docker-compose.yml b/vendor/blueimp/jquery-file-upload/docker-compose.yml
new file mode 100644
index 000000000..d84a43e27
--- /dev/null
+++ b/vendor/blueimp/jquery-file-upload/docker-compose.yml
@@ -0,0 +1,59 @@
+version: '3.7'
+services:
+  example:
+    build: server/php
+    ports:
+      - 127.0.0.1:80:80
+      - ${SERVER_HOST:-127.0.0.1}:${SERVER_PORT-}:80
+    volumes:
+      - .:/var/www/html
+  mocha:
+    build: test
+    command: http://example/test
+    volumes:
+      - .:/var/www/html
+    depends_on:
+      - example
+  chromedriver:
+    image: blueimp/chromedriver
+    init: true
+    tmpfs: /tmp
+    environment:
+      - DISABLE_X11=false
+      - ENABLE_VNC=true
+      - EXPOSE_X11=true
+    volumes:
+      - ./wdio/assets:/home/webdriver/assets:ro
+    ports:
+      - 127.0.0.1:5900:5900
+  geckodriver:
+    image: blueimp/geckodriver
+    init: true
+    tmpfs: /tmp
+    shm_size: 2g
+    environment:
+      - DISABLE_X11=false
+      - ENABLE_VNC=true
+      - EXPOSE_X11=true
+    volumes:
+      - ./wdio/assets:/home/webdriver/assets:ro
+    ports:
+      - 127.0.0.1:5901:5900
+  wdio:
+    image: blueimp/wdio
+    init: true
+    read_only: true
+    tmpfs:
+      - /tmp
+    environment:
+      - WAIT_FOR_HOSTS= chromedriver:4444 geckodriver:4444 example:80
+      - WINDOWS_HOST
+      - MACOS_ASSETS_DIR=$PWD/wdio/assets/
+      - WINDOWS_ASSETS_DIR
+    volumes:
+      - ./wdio:/opt:ro
+      - ./wdio/reports:/opt/reports
+    depends_on:
+      - chromedriver
+      - geckodriver
+      - example