From 103cc6761248f36a0229814561203b8f426e14d1 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 9 Feb 2021 22:16:12 +0100 Subject: [PATCH] Supporting to new Edge [deploy][prerelease] --- README.md | 2 +- StandaloneEdge/Dockerfile | 2 +- docker-compose-v2.yml | 2 +- docker-compose-v3-full-grid-dev.yml | 18 ++++++++++++++++-- docker-compose-v3-full-grid.yml | 2 +- docker-compose-v3-swarm.yml | 2 +- docker-compose-v3-video.yml | 4 ++-- docker-compose-v3.yml | 2 +- k8s-deployment-full-grid.yaml | 2 +- 9 files changed, 25 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 56f453dbc..dbeb85eaf 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ $ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \ -e SE_EVENT_BUS_PUBLISH_PORT=4442 \ -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \ -v /dev/shm:/dev/shm \ - selenium/node-opera:4.0.0-beta-1-prerelease-20210204 + selenium/node-opera:4.0.0-beta-1-prerelease-20210207 ``` When you are done using the Grid, and the containers have exited, the network can be removed with the following command: diff --git a/StandaloneEdge/Dockerfile b/StandaloneEdge/Dockerfile index 22166c5a4..f699e006d 100644 --- a/StandaloneEdge/Dockerfile +++ b/StandaloneEdge/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM selenium/node-edge:4.0.0-beta-1-prerelease-20210201 +FROM selenium/node-edge:4.0.0-beta-1-prerelease-20210207 LABEL authors=SeleniumHQ USER 1200 diff --git a/docker-compose-v2.yml b/docker-compose-v2.yml index f7c6b25eb..1483d3018 100644 --- a/docker-compose-v2.yml +++ b/docker-compose-v2.yml @@ -17,7 +17,7 @@ services: - "6900:5900" edge: - image: selenium/node-edge:4.0.0-beta-1-prerelease-20210201 + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 volumes: - /dev/shm:/dev/shm depends_on: diff --git a/docker-compose-v3-full-grid-dev.yml b/docker-compose-v3-full-grid-dev.yml index e98928d09..755f2a34b 100644 --- a/docker-compose-v3-full-grid-dev.yml +++ b/docker-compose-v3-full-grid-dev.yml @@ -94,6 +94,20 @@ services: ports: - "6900:5900" + edge: + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 + volumes: + - ./selenium_server_deploy.jar:/opt/selenium/selenium-server.jar + - /dev/shm:/dev/shm + depends_on: + - selenium-event-bus + environment: + - SE_EVENT_BUS_HOST=selenium-event-bus + - SE_EVENT_BUS_PUBLISH_PORT=4442 + - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 + ports: + - "6901:5900" + firefox: image: selenium/node-firefox:4.0.0-beta-1-prerelease-20210207 volumes: @@ -106,7 +120,7 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 ports: - - "6901:5900" + - "6902:5900" opera: image: selenium/node-opera:4.0.0-beta-1-prerelease-20210207 @@ -120,4 +134,4 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 ports: - - "6902:5900" + - "6903:5900" diff --git a/docker-compose-v3-full-grid.yml b/docker-compose-v3-full-grid.yml index 0895b2961..b1edf22bf 100644 --- a/docker-compose-v3-full-grid.yml +++ b/docker-compose-v3-full-grid.yml @@ -84,7 +84,7 @@ services: - "6900:5900" edge: - image: selenium/node-edge:4.0.0-beta-1-prerelease-20210201 + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 volumes: - /dev/shm:/dev/shm depends_on: diff --git a/docker-compose-v3-swarm.yml b/docker-compose-v3-swarm.yml index 49ab120e2..fbd3af989 100644 --- a/docker-compose-v3-swarm.yml +++ b/docker-compose-v3-swarm.yml @@ -19,7 +19,7 @@ services: entrypoint: bash -c 'SE_OPTS="--host $$HOSTNAME" /opt/bin/entry_point.sh' edge: - image: selenium/node-edge:4.0.0-beta-1-prerelease-20210201 + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 volumes: - /dev/shm:/dev/shm environment: diff --git a/docker-compose-v3-video.yml b/docker-compose-v3-video.yml index ab3bfb740..bac76127b 100644 --- a/docker-compose-v3-video.yml +++ b/docker-compose-v3-video.yml @@ -17,7 +17,7 @@ services: - "6900:5900" edge: - image: selenium/node-edge:4.0.0-beta-1-prerelease-20210201 + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 volumes: - /dev/shm:/dev/shm depends_on: @@ -66,7 +66,7 @@ services: - FILE_NAME=chrome_video.mp4 edge_video: - image: selenium/video:ffmpeg-4.3.1-20210201 + image: selenium/video:ffmpeg-4.3.1-20210207 volumes: - /tmp/videos:/videos depends_on: diff --git a/docker-compose-v3.yml b/docker-compose-v3.yml index 19a512fa0..eeac939f1 100644 --- a/docker-compose-v3.yml +++ b/docker-compose-v3.yml @@ -17,7 +17,7 @@ services: - "6900:5900" edge: - image: selenium/node-edge:4.0.0-beta-1-prerelease-20210201 + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 volumes: - /dev/shm:/dev/shm depends_on: diff --git a/k8s-deployment-full-grid.yaml b/k8s-deployment-full-grid.yaml index ae26792b3..ebf46b6f6 100644 --- a/k8s-deployment-full-grid.yaml +++ b/k8s-deployment-full-grid.yaml @@ -396,7 +396,7 @@ spec: spec: containers: - name: selenium-edge-node - image: selenium/node-edge:4.0.0-beta-1-prerelease-20210201 + image: selenium/node-edge:4.0.0-beta-1-prerelease-20210207 env: - name: SE_EVENT_BUS_HOST value: "selenium-event-bus"