From d6665a16913155fe96450f4cfa18b132e4b0e898 Mon Sep 17 00:00:00 2001 From: kev Date: Sun, 4 Aug 2019 13:04:08 +0800 Subject: [PATCH] update selenium stack --- selenium/docker-stack.yml | 43 +++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/selenium/docker-stack.yml b/selenium/docker-stack.yml index 7c15e73..391456b 100644 --- a/selenium/docker-stack.yml +++ b/selenium/docker-stack.yml @@ -1,15 +1,37 @@ version: '3.5' services: hub: - image: selenium/hub:3.141.59-radium + image: selenium/hub:3.141.59-selenium ports: - "4444:4444" volumes: - /dev/shm:/dev/shm environment: - - JAVA_OPTS=-Xmx512m - - GRID_TIMEOUT=60 - - GRID_BROWSER_TIMEOUT=30 + - JAVA_OPTS=-Xmx2g + - GRID_TIMEOUT=200 + - GRID_BROWSER_TIMEOUT=180 + - GRID_CLEAN_UP_CYCLE=5000 + - GRID_MAX_SESSION=9999 + deploy: + replicas: 1 + placement: + constraints: + - node.role == manager + restart_policy: + condition: on-failure + firefox: + image: selenium/node-firefox:3.141.59-selenium + entrypoint: bash -c 'REMOTE_HOST=http://$$HOSTNAME:5555 /opt/bin/entry_point.sh' + volumes: + - /dev/shm:/dev/shm + environment: + - HUB_HOST=hub + - HUB_PORT=4444 + - NODE_MAX_INSTANCES=4 + - NODE_MAX_SESSION=4 + - NODE_UNREGISTER_IF_STILL_DOWN_AFTER=30000 + depends_on: + - hub deploy: replicas: 1 placement: @@ -18,17 +40,16 @@ services: restart_policy: condition: on-failure chrome: - image: selenium/node-chrome:3.141.59-radium - ports: - - "5555:5555" + image: selenium/node-chrome:3.141.59-selenium + entrypoint: bash -c 'REMOTE_HOST=http://$$HOSTNAME:5555 /opt/bin/entry_point.sh' volumes: - /dev/shm:/dev/shm environment: - HUB_HOST=hub - HUB_PORT=4444 - - REMOTE_HOST=http://{{.Task.Name}}:5555 - - NODE_MAX_INSTANCES=4 - - NODE_MAX_SESSION=4 + - NODE_MAX_INSTANCES=8 + - NODE_MAX_SESSION=8 + - NODE_UNREGISTER_IF_STILL_DOWN_AFTER=30000 depends_on: - hub deploy: @@ -42,4 +63,4 @@ networks: default: ipam: config: - - subnet: 192.168.127.0/24 + - subnet: 192.168.100.0/24