diff --git a/Base/Dockerfile b/Base/Dockerfile index 01572c9eee..0b08ab5f15 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update -qqy \ # Selenium #========== RUN mkdir -p /opt/selenium \ - && wget --no-verbose https://selenium-release.storage.googleapis.com/3.1/selenium-server-standalone-3.1.0.jar -O /opt/selenium/selenium-server-standalone.jar + && wget --no-verbose https://selenium-release.storage.googleapis.com/3.2/selenium-server-standalone-3.2.0.jar -O /opt/selenium/selenium-server-standalone.jar #======================================== # Add normal user with passwordless sudo diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 0caf0d8bb7..ebb0982abc 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:3.1.0-astatine +FROM selenium/base:3.2.0-actinium MAINTAINER Selenium #======================== @@ -12,13 +12,19 @@ MAINTAINER Selenium EXPOSE 4444 ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true +# In milliseconds ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1 ENV GRID_JETTY_MAX_THREADS -1 +# In milliseconds ENV GRID_NODE_POLLING 5000 +# In milliseconds ENV GRID_CLEAN_UP_CYCLE 5000 +# In seconds ENV GRID_TIMEOUT 30 +# In seconds ENV GRID_BROWSER_TIMEOUT 0 ENV GRID_MAX_SESSION 5 +# In milliseconds ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000 COPY generate_config /opt/selenium/generate_config diff --git a/Makefile b/Makefile index e0a248aad3..eabc732997 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME := selenium -VERSION := $(or $(VERSION),$(VERSION),3.1.0-astatine) +VERSION := $(or $(VERSION),$(VERSION),3.2.0-actinium) PLATFORM := $(shell uname -s) BUILD_ARGS := $(BUILD_ARGS) MAJOR := $(word 1,$(subst ., ,$(VERSION))) diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index 1a0a6098f7..3a1a61cef5 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:3.1.0-astatine +FROM selenium/base:3.2.0-actinium MAINTAINER Selenium ENV DEBIAN_FRONTEND noninteractive diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile index dcb642b080..c265df2f46 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:3.1.0-astatine +FROM selenium/node-base:3.2.0-actinium MAINTAINER Selenium USER root @@ -29,7 +29,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key #================== # Chrome webdriver #================== -ARG CHROME_DRIVER_VERSION=2.27 +ARG CHROME_DRIVER_VERSION=2.28 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \ && rm -rf /opt/selenium/chromedriver \ && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \ diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile index 122f64d914..753bc87a31 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:3.1.0-astatine +FROM selenium/node-chrome:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/NodeChromeDebug/README.md b/NodeChromeDebug/README.md index 729c010d77..4254c78e5d 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:3.0.1-germanium +FROM selenium/node-chrome-debug:3.1.0-actinium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodeDebug/README.template.md b/NodeDebug/README.template.md index e6cc7a1a4e..4a41e7801b 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:3.0.1-germanium +FROM selenium/##BASE##-debug:3.1.0-actinium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index 9027bc243a..c28cfce370 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:3.1.0-astatine +FROM selenium/node-base:3.2.0-actinium MAINTAINER Selenium USER root @@ -10,7 +10,7 @@ USER root #========= # Firefox #========= -ARG FIREFOX_VERSION=51.0.1 +ARG FIREFOX_VERSION=52.0 RUN apt-get update -qqy \ && apt-get -qqy --no-install-recommends install firefox \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile index ba18b35797..1898d5ce00 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:3.1.0-astatine +FROM selenium/node-firefox:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/Dockerfile.txt b/NodeFirefoxDebug/Dockerfile.txt index 34011a083f..7b60390479 100644 --- a/NodeFirefoxDebug/Dockerfile.txt +++ b/NodeFirefoxDebug/Dockerfile.txt @@ -1,4 +1,4 @@ -FROM selenium/node-firefox:3.0.1-germanium +FROM selenium/node-firefox:3.1.0-actinium MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/README.md b/NodeFirefoxDebug/README.md index a9f9fddd3f..6126fcb05c 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:3.0.1-germanium +FROM selenium/node-firefox-debug:3.1.0-actinium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodePhantomJS/Dockerfile b/NodePhantomJS/Dockerfile index 5dd3de5e4d..29e37b87ad 100644 --- a/NodePhantomJS/Dockerfile +++ b/NodePhantomJS/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:3.0.1-fermium +FROM selenium/node-base:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/README.md b/README.md index 375b32587f..26f86ab6fc 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,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:3.0.1-germanium +$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.1.0-actinium ``` This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952 @@ -35,9 +35,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:3.0.1-germanium +$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.1.0-actinium # OR -$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.0.1-germanium +$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.1.0-actinium ``` _Note: Only one standalone image can run on port_ `4444` _at a time._ @@ -47,9 +47,9 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug` ### Selenium Grid Hub and Nodes ``` bash -$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.0.1-germanium -$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.0.1-germanium -$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.0.1-germanium +$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.1.0-actinium +$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.1.0-actinium +$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.1.0-actinium ``` ## Configuring the containers @@ -59,7 +59,7 @@ $ docker run -d --link selenium-hub:hub selenium/node-firefox:3.0.1-germanium 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:3.0.1-germanium +$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.1.0-actinium ``` ### SE_OPTS Selenium Configuration Options @@ -67,7 +67,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:3.0.1-germanium +$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:3.1.0-actinium ``` ### PHANTOMJS_OPTS PhantomJS Configuration Options @@ -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:3.0.1-germanium +$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.1.0-actinium $ CH=$(docker run --rm --name=ch \ --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \ - selenium/node-chrome:3.0.1-germanium) + selenium/node-chrome:3.1.0-actinium) ``` _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:3.0.1-germanium +$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.1.0-actinium $ FF=$(docker run --rm --name=fx \ --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \ - selenium/node-firefox:3.0.1-germanium) + selenium/node-firefox:3.1.0-actinium) ``` _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:3.0.1-germanium -$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-germanium +$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-chrome-debug:3.1.0-actinium +$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-firefox-debug:3.1.0-actinium ``` e.g.: ``` bash -$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-germanium -$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-germanium +$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.1.0-actinium +$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.1.0-actinium ``` 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:3.0.1-germanium +$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-chrome-debug:3.1.0-actinium # OR -$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-firefox-debug:3.0.1-germanium +$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-firefox-debug:3.1.0-actinium ``` or ``` bash -$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.0.1-germanium +$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.1.0-actinium # OR -$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.0.1-germanium +$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.1.0-actinium ``` 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:3.0.1-germanium -#FROM selenium/node-firefox-debug:3.0.1-germanium +#FROM selenium/node-chrome-debug:3.1.0-actinium +#FROM selenium/node-firefox-debug:3.1.0-actinium #Choose the FROM statement that works for you. RUN x11vnc -storepasswd /home/seluser/.vnc/passwd diff --git a/StandaloneChrome/Dockerfile b/StandaloneChrome/Dockerfile index 7a7f994423..7d6951a93b 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:3.1.0-astatine +FROM selenium/node-chrome:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/StandaloneChromeDebug/Dockerfile b/StandaloneChromeDebug/Dockerfile index 90038d19be..6b0951f581 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:3.1.0-astatine +FROM selenium/standalone-chrome:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile index 8a1f997a45..0acee33d0c 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:3.1.0-astatine +FROM selenium/node-firefox:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/StandaloneFirefoxDebug/Dockerfile b/StandaloneFirefoxDebug/Dockerfile index 16c9d1b1ff..a41264b7df 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:3.1.0-astatine +FROM selenium/standalone-firefox:3.2.0-actinium MAINTAINER Selenium USER root diff --git a/sa-test.sh b/sa-test.sh index 5e3b52c5eb..17b2b67a29 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:3.0.1-germanium) + SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:3.1.0-actinium) SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::) TEST_CMD="node smoke-$BROWSER.js" diff --git a/test.sh b/test.sh index 77f3120f42..0548e7faa8 100755 --- a/test.sh +++ b/test.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash DEBUG='' -VERSION=${VERSION:-3.0.1-germanium} +VERSION=${VERSION:-3.1.0-actinium} if [ -n "$1" ] && [ $1 == 'debug' ]; then DEBUG='-debug' @@ -24,7 +24,7 @@ echo Building test container image docker build -t selenium/test:local ./Test echo 'Starting Selenium Hub Container...' -HUB=$(docker run -d selenium/hub:3.0.1-germanium) +HUB=$(docker run -d selenium/hub:3.1.0-actinium) HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::) echo 'Waiting for Hub to come online...' docker logs -f $HUB &