From d872082cfd94a895e5e3aea326f13a90ba0dc051 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Wed, 23 Nov 2016 15:51:17 +0800
Subject: [PATCH] update selenium (timeout in seconds)

---
 selenium/README.md              | 31 ++++++++++++++++++++++++++-----
 selenium/docker-compose-hub.yml |  4 ++--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/selenium/README.md b/selenium/README.md
index 2101d94..5afb876 100644
--- a/selenium/README.md
+++ b/selenium/README.md
@@ -21,7 +21,7 @@ firefox:
   restart: always
 ```
 
-docker-compose-grid.yml (not tested yet)
+docker-compose-hub.yml
 
 ```yaml
 hub:
@@ -29,6 +29,9 @@ hub:
   container_name: hub
   ports:
     - "4444:4444"
+  environment:
+    - GRID_TIMEOUT=60
+    - GRID_BROWSER_TIMEOUT=30
   retart: always
 
 chrome:
@@ -52,13 +55,31 @@ firefox:
 
 > Access grid console at <http://127.0.0.1:4444/grid/console>
 
+docker-compose-node.yml
+
+```yaml
+firefox:
+  image: selenium/node-firefox
+  ports:
+    - "5555:5555"
+    - "5900:5900"
+  environment:
+    - JAVA_OPTS=-Xmx512m
+    - NODE_MAX_INSTANCES=2
+    - NODE_MAX_SESSION=2
+    - SE_OPTS=-host 5.6.7.8 -port 5555
+    - HUB_PORT_4444_TCP_ADDR=1.2.3.4
+    - HUB_PORT_4444_TCP_PORT=4444
+  restart: always
+```
+
 ```bash
 $ docker-compose up -d
 ```
 
 > Another way to start selenium server:
 
-```
+```bash
 $ npm install -g selenium-standalone
 $ selenium-standalone install
 $ selenium-standalone start
@@ -68,7 +89,7 @@ $ selenium-standalone start
 
 baidu-search.py
 
-```
+```python
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
@@ -86,7 +107,7 @@ driver.close()
 
 search-baidu.js
 
-```
+```javascript
 var webdriver = require('selenium-webdriver'),
     By = require('selenium-webdriver').By,
     until = require('selenium-webdriver').until,
@@ -113,7 +134,7 @@ driver.saveScreenshot('baidu.png');
 driver.quit();
 ```
 
-```
+```bash
 # VNC
 $ open vnc://:secret@127.0.0.1:5900
 
diff --git a/selenium/docker-compose-hub.yml b/selenium/docker-compose-hub.yml
index bd5ae3d..a8c2fca 100644
--- a/selenium/docker-compose-hub.yml
+++ b/selenium/docker-compose-hub.yml
@@ -3,8 +3,8 @@ hub:
   ports:
     - "4444:4444"
   environment:
-    - GRID_TIMEOUT=30000
-    - GRID_BROWSER_TIMEOUT=30000
+    - GRID_TIMEOUT=60
+    - GRID_BROWSER_TIMEOUT=30
   restart: always
 
 firefox: