From e733a6f6209becc3620dde860061b232f64cbac3 Mon Sep 17 00:00:00 2001 From: Daniel Davison Date: Mon, 10 Oct 2016 12:10:43 -0400 Subject: [PATCH] prepare 2.53.1-beryllium --- Hub/Dockerfile | 2 +- Makefile | 2 +- NodeBase/Dockerfile | 4 +-- NodeChrome/Dockerfile | 4 +-- NodeChromeDebug/Dockerfile | 2 +- NodeChromeDebug/README.md | 2 +- NodeDebug/README.template.md | 2 +- NodeFirefox/Dockerfile | 8 ++--- NodeFirefoxDebug/Dockerfile | 10 +++--- NodeFirefoxDebug/Dockerfile.txt | 2 +- NodeFirefoxDebug/README.md | 2 +- README.md | 54 +++++++++++++++---------------- StandaloneChrome/Dockerfile | 2 +- StandaloneChromeDebug/Dockerfile | 2 +- StandaloneFirefox/Dockerfile | 2 +- StandaloneFirefoxDebug/Dockerfile | 2 +- sa-test.sh | 2 +- test.sh | 6 ++-- 18 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 5ab08f226..15c609598 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM selenium/base:2.53.1-americium +FROM selenium/base:2.53.1-beryllium MAINTAINER Selenium #======================== diff --git a/Makefile b/Makefile index a911f685f..abc156f14 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME := selenium -VERSION := $(or $(VERSION),$(VERSION),'2.53.1') +VERSION := $(or $(VERSION),$(VERSION),'2.53.1-beryllium') PLATFORM := $(shell uname -s) BUILD_ARGS := $(BUILD_ARGS) diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index d866c8b69..ee7b4709a 100644 --- a/NodeBase/Dockerfile +++ b/NodeBase/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM selenium/base:2.53.1-americium +FROM selenium/base:2.53.1-beryllium MAINTAINER Selenium ENV DEBIAN_FRONTEND noninteractive @@ -22,7 +22,7 @@ RUN echo "${TZ}" > /etc/timezone \ RUN apt-get update -qqy \ && apt-get -qqy install \ xvfb \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* #============================== # Scripts to run Selenium Node diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile index 77657351f..c18feea21 100644 --- a/NodeChrome/Dockerfile +++ b/NodeChrome/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-base:2.53.1-americium +FROM selenium/node-base:2.53.1-beryllium MAINTAINER Selenium USER root @@ -24,7 +24,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key && apt-get -qqy install \ ${CHROME_VERSION:-google-chrome-stable} \ && rm /etc/apt/sources.list.d/google-chrome.list \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* #================== # Chrome webdriver diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile index 1acc628b3..3280c2290 100644 --- a/NodeChromeDebug/Dockerfile +++ b/NodeChromeDebug/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-chrome:2.53.1-americium +FROM selenium/node-chrome:2.53.1-beryllium MAINTAINER Selenium USER root diff --git a/NodeChromeDebug/README.md b/NodeChromeDebug/README.md index 0dc128448..0ed5be050 100644 --- a/NodeChromeDebug/README.md +++ b/NodeChromeDebug/README.md @@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http: When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it: ``` dockerfile -FROM selenium/node-chrome-debug:2.53.1 +FROM selenium/node-chrome-debug:2.53.1-beryllium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodeDebug/README.template.md b/NodeDebug/README.template.md index 8ff4aa15f..38097eb90 100644 --- a/NodeDebug/README.template.md +++ b/NodeDebug/README.template.md @@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http: When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it: ``` dockerfile -FROM selenium/##BASE##-debug:2.53.1 +FROM selenium/##BASE##-debug:2.53.1-beryllium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index d47da54d2..74fdd7d06 100644 --- a/NodeFirefox/Dockerfile +++ b/NodeFirefox/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-base:2.53.1-americium +FROM selenium/node-base:2.53.1-beryllium MAINTAINER Selenium USER root @@ -10,10 +10,10 @@ USER root #========= # Firefox #========= -ENV FIREFOX_VERSION 47.0.1 +ARG FIREFOX_VERSION=47.0.1 RUN apt-get update -qqy \ && apt-get -qqy --no-install-recommends install firefox \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ && wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2 \ && apt-get -y purge firefox \ && rm -rf /opt/firefox \ @@ -25,7 +25,7 @@ RUN apt-get update -qqy \ #============ # GeckoDriver #============ -ENV GECKODRIVER_VERSION 0.10.0 +ARG GECKODRIVER_VERSION=0.10.0 RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz \ && rm -rf /opt/geckodriver \ && tar -C /opt -zxf /tmp/geckodriver.tar.gz \ diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile index a30cbf634..d5b513c95 100644 --- a/NodeFirefoxDebug/Dockerfile +++ b/NodeFirefoxDebug/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-firefox:2.53.1-americium +FROM selenium/node-firefox:2.53.1-beryllium MAINTAINER Selenium USER root @@ -13,7 +13,7 @@ USER root RUN apt-get update -qqy \ && apt-get -qqy install \ x11vnc \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ && mkdir -p /root/.vnc \ && x11vnc -storepasswd secret ~/.vnc/passwd @@ -27,7 +27,7 @@ RUN locale-gen en_US.UTF-8 \ && apt-get update -qqy \ && apt-get -qqy --no-install-recommends install \ language-pack-en \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* #======= # Fonts @@ -39,7 +39,7 @@ RUN apt-get update -qqy \ xfonts-75dpi \ xfonts-cyrillic \ xfonts-scalable \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* #========= # fluxbox @@ -48,7 +48,7 @@ RUN apt-get update -qqy \ RUN apt-get update -qqy \ && apt-get -qqy install \ fluxbox \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* #============================== # Scripts to run Selenium Node diff --git a/NodeFirefoxDebug/Dockerfile.txt b/NodeFirefoxDebug/Dockerfile.txt index 886b131e4..815156f30 100644 --- a/NodeFirefoxDebug/Dockerfile.txt +++ b/NodeFirefoxDebug/Dockerfile.txt @@ -1,4 +1,4 @@ -FROM selenium/node-firefox:2.53.1 +FROM selenium/node-firefox:2.53.1-beryllium MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/README.md b/NodeFirefoxDebug/README.md index e01beed1a..952a03432 100644 --- a/NodeFirefoxDebug/README.md +++ b/NodeFirefoxDebug/README.md @@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http: When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it: ``` dockerfile -FROM selenium/node-firefox-debug:2.53.1 +FROM selenium/node-firefox-debug:2.53.1-beryllium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/README.md b/README.md index ffd8f1fe8..f6ce9332c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Images included: When executing docker run for an image with chrome browser please add volume mount `-v /dev/shm:/dev/shm` to use the host's shared memory. ``` bash -$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:2.53.1 +$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:2.53.1-beryllium ``` This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952 @@ -34,9 +34,9 @@ This is a workaround to node-chrome crash in docker container issue: https://cod ### Standalone Chrome and Firefox ``` bash -$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.53.1 +$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.53.1-beryllium # OR -$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.53.1 +$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.53.1-beryllium ``` _Note: Only one standalone image can run on port_ `4444` _at a time._ @@ -46,14 +46,14 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug` ### Selenium Grid Hub ``` bash -$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.53.1 +$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.53.1-beryllium ``` ### Chrome and Firefox Grid Nodes ``` bash -$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.53.1 -$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.53.1 +$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.53.1-beryllium +$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.53.1-beryllium ``` ### JAVA_OPTS Java Environment Options @@ -61,7 +61,7 @@ $ docker run -d --link selenium-hub:hub selenium/node-firefox:2.53.1 You can pass `JAVA_OPTS` environment variable to java process. ``` bash -$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:2.53.1 +$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:2.53.1-beryllium ``` ### SE_OPTS Selenium Configuration Options @@ -69,7 +69,7 @@ $ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/ You can pass `SE_OPTS` variable with additional commandline parameters for starting a hub or a node. ``` bash -$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:2.53.1 +$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:2.53.1-beryllium ``` ## Building the images @@ -99,10 +99,10 @@ _Note: Omitting_ `VERSION=local` _will build the images with the current version ##### Example: Spawn a container for testing in Chrome: ``` bash -$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.53.1 +$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.53.1-beryllium $ CH=$(docker run --rm --name=ch \ --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \ - selenium/node-chrome:2.53.1) + selenium/node-chrome:2.53.1-beryllium) ``` _Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing browser uploads on your web app you will probably need to share a directory for this._ @@ -112,10 +112,10 @@ _Note:_ `-v /e2e/uploads:/e2e/uploads` _is optional in case you are testing brow This command line is the same as for Chrome. Remember that the Selenium running container is able to launch either Chrome or Firefox, the idea around having 2 separate containers, one for each browser is for convenience plus avoiding certain `:focus` issues your web app may encounter during end-to-end test automation. ``` bash -$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.53.1 +$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.53.1-beryllium $ FF=$(docker run --rm --name=fx \ --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \ - selenium/node-firefox:2.53.1) + selenium/node-firefox:2.53.1-beryllium) ``` _Note: Since a Docker container is not meant to preserve state and spawning a new one takes less than 3 seconds you will likely want to remove containers after each end-to-end test with_ `--rm` _command. You need to think of your Docker containers as single processes, not as running virtual machines, in case you are familiar with [Vagrant](https://www.vagrantup.com/)._ @@ -124,28 +124,28 @@ _Note: Since a Docker container is not meant to preserve state and spawning a ne In the event you wish to visually see what the browser is doing you will want to run the `debug` variant of node or standalone images. A VNC server will run on port 5900. You are free to map that to any free external port that you wish. Example: : 5900) you will only be able to run 1 node per port so if you wish to include a second node, or more, you will have to use different ports, the 5900 as the internal port will have to remain the same though as thats the VNC service on the node. The second example below shows how to run multiple nodes and with different VNC ports open: ``` bash -$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-chrome-debug:2.53.1 -$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-firefox-debug:2.53.1 +$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-chrome-debug:2.53.1-beryllium +$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-firefox-debug:2.53.1-beryllium ``` e.g.: ``` bash -$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:2.53.1 -$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:2.53.1 +$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:2.53.1-beryllium +$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:2.53.1-beryllium ``` to connect to the Chrome node on 5900 and the Firefox node on 5901 (assuming those node are free, and reachable). And for standalone: ``` bash -$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-chrome-debug:2.53.1 +$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-chrome-debug:2.53.1-beryllium # OR -$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-firefox-debug:2.53.1 +$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-firefox-debug:2.53.1-beryllium ``` or ``` bash -$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:2.53.1 +$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:2.53.1-beryllium # OR -$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:2.53.1 +$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:2.53.1-beryllium ``` You can acquire the port that the VNC server is exposed to by running: @@ -164,8 +164,8 @@ If you are running [Boot2Docker](https://docs.docker.com/installation/mac/) on O When you are prompted for the password it is `secret`. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a Docker image that derives from the posted ones which reconfigures it: ``` dockerfile -#FROM selenium/node-chrome-debug:2.53.1 -#FROM selenium/node-firefox-debug:2.53.1 +#FROM selenium/node-chrome-debug:2.53.1-beryllium +#FROM selenium/node-firefox-debug:2.53.1-beryllium #Choose the FROM statement that works for you. RUN x11vnc -storepasswd /home/seluser/.vnc/passwd @@ -177,11 +177,11 @@ RUN x11vnc -storepasswd /home/seluser/.vnc/passwd $ docker images #=> REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE -selenium/node-firefox 2.53.1 69f762d0d79e 29 minutes ago 552.1 MB -selenium/node-chrome 2.53.1 9dd73160660b 30 minutes ago 723.6 MB -selenium/node-base 2.53.1 1b7a0b7024b1 32 minutes ago 426.1 MB -selenium/hub 2.53.1 2570bbb98229 33 minutes ago 394.4 MB -selenium/base 2.53.1 33478d455dab 33 minutes ago 362.6 MB +selenium/node-firefox 2.53.1-beryllium 69f762d0d79e 29 minutes ago 552.1 MB +selenium/node-chrome 2.53.1-beryllium 9dd73160660b 30 minutes ago 723.6 MB +selenium/node-base 2.53.1-beryllium 1b7a0b7024b1 32 minutes ago 426.1 MB +selenium/hub 2.53.1-beryllium 2570bbb98229 33 minutes ago 394.4 MB +selenium/base 2.53.1-beryllium 33478d455dab 33 minutes ago 362.6 MB ubuntu 16.04 0b7735b9290f 6 days ago 123.7 MB ``` diff --git a/StandaloneChrome/Dockerfile b/StandaloneChrome/Dockerfile index 39963d1f9..703c522ae 100644 --- a/StandaloneChrome/Dockerfile +++ b/StandaloneChrome/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-chrome:2.53.1-americium +FROM selenium/node-chrome:2.53.1-beryllium MAINTAINER Selenium USER root diff --git a/StandaloneChromeDebug/Dockerfile b/StandaloneChromeDebug/Dockerfile index 4463a0d99..e5780cd1c 100644 --- a/StandaloneChromeDebug/Dockerfile +++ b/StandaloneChromeDebug/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM selenium/standalone-chrome:2.53.1-americium +FROM selenium/standalone-chrome:2.53.1-beryllium MAINTAINER Selenium USER root diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile index 12e3c9a92..ca23ed573 100644 --- a/StandaloneFirefox/Dockerfile +++ b/StandaloneFirefox/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-firefox:2.53.1-americium +FROM selenium/node-firefox:2.53.1-beryllium MAINTAINER Selenium USER root diff --git a/StandaloneFirefoxDebug/Dockerfile b/StandaloneFirefoxDebug/Dockerfile index 8e898208e..c07668b0d 100644 --- a/StandaloneFirefoxDebug/Dockerfile +++ b/StandaloneFirefoxDebug/Dockerfile @@ -2,7 +2,7 @@ # NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED. # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -FROM selenium/standalone-firefox:2.53.1-americium +FROM selenium/standalone-firefox:2.53.1-beryllium MAINTAINER Selenium USER root diff --git a/sa-test.sh b/sa-test.sh index 2663d6dd8..649c551e6 100755 --- a/sa-test.sh +++ b/sa-test.sh @@ -13,7 +13,7 @@ function test_standalone { BROWSER=$1 echo Starting Selenium standalone-$BROWSER$DEBUG container - SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.53.1) + SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.53.1-beryllium) SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::) TEST_CMD="node smoke-$BROWSER.js" diff --git a/test.sh b/test.sh index 9a3c0416c..b8f2524fd 100755 --- a/test.sh +++ b/test.sh @@ -23,16 +23,16 @@ echo Building test container image docker build -t selenium/test:local ./Test echo 'Starting Selenium Hub Container...' -HUB=$(docker run -d selenium/hub:2.53.1) +HUB=$(docker run -d selenium/hub:2.53.1-beryllium) HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::) echo 'Waiting for Hub to come online...' docker logs -f $HUB & sleep 2 echo 'Starting Selenium Chrome node...' -NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:2.53.1) +NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:2.53.1-beryllium) echo 'Starting Selenium Firefox node...' -NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.53.1) +NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.53.1-beryllium) docker logs -f $NODE_CHROME & docker logs -f $NODE_FIREFOX & echo 'Waiting for nodes to register and come online...'