From fafabb487fb34273286878bc3cf667e75a4eb8a6 Mon Sep 17 00:00:00 2001 From: Daniel Davison Date: Wed, 4 Jan 2017 13:39:11 -0500 Subject: [PATCH] update to dysprosium --- Hub/Dockerfile | 2 +- Makefile | 2 +- NodeBase/Dockerfile | 2 +- NodeChrome/Dockerfile | 2 +- NodeChromeDebug/Dockerfile | 2 +- NodeChromeDebug/README.md | 2 +- NodeDebug/README.template.md | 2 +- NodeFirefox/Dockerfile | 2 +- NodeFirefoxDebug/Dockerfile | 2 +- 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, 46 insertions(+), 46 deletions(-) diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 9d7002104..2d1027a59 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.0.1-carbon +FROM selenium/base:3.0.1-dysprosium MAINTAINER Selenium #======================== diff --git a/Makefile b/Makefile index 50d00725b..b76035a27 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME := selenium -VERSION := $(or $(VERSION),$(VERSION),3.0.1-carbon) +VERSION := $(or $(VERSION),$(VERSION),3.0.1-dysprosium) PLATFORM := $(shell uname -s) BUILD_ARGS := $(BUILD_ARGS) MAJOR := $(word 1,$(subst ., ,$(VERSION))) diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index 87946a3ff..ea9d3622f 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.0.1-carbon +FROM selenium/base:3.0.1-dysprosium MAINTAINER Selenium ENV DEBIAN_FRONTEND noninteractive diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile index 648d8f90f..df8557b8f 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.0.1-carbon +FROM selenium/node-base:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile index 90a78d6d0..a7e23962f 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.0.1-carbon +FROM selenium/node-chrome:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/NodeChromeDebug/README.md b/NodeChromeDebug/README.md index 9e5a1c0fa..b82418b12 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-carbon +FROM selenium/node-chrome-debug:3.0.1-dysprosium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodeDebug/README.template.md b/NodeDebug/README.template.md index e7f9d1699..759312af0 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-carbon +FROM selenium/##BASE##-debug:3.0.1-dysprosium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index f28ce4444..1d7df6325 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.0.1-carbon +FROM selenium/node-base:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile index 93b641f63..40e27c48c 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.0.1-carbon +FROM selenium/node-firefox:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/Dockerfile.txt b/NodeFirefoxDebug/Dockerfile.txt index c69789d82..a09ecd615 100644 --- a/NodeFirefoxDebug/Dockerfile.txt +++ b/NodeFirefoxDebug/Dockerfile.txt @@ -1,4 +1,4 @@ -FROM selenium/node-firefox:3.0.1-carbon +FROM selenium/node-firefox:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/NodeFirefoxDebug/README.md b/NodeFirefoxDebug/README.md index 1400bfcf8..4579dc195 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-carbon +FROM selenium/node-firefox-debug:3.0.1-dysprosium RUN x11vnc -storepasswd /home/seluser/.vnc/passwd ``` diff --git a/README.md b/README.md index 41a0e4324..eee817438 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:3.0.1-carbon +$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.0.1-dysprosium ``` 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:3.0.1-carbon +$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.0.1-dysprosium # OR -$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.0.1-carbon +$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.0.1-dysprosium ``` _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:3.0.1-carbon +$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.0.1-dysprosium ``` ### Chrome and Firefox Grid Nodes ``` bash -$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.0.1-carbon -$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.0.1-carbon +$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.0.1-dysprosium +$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.0.1-dysprosium ``` ### JAVA_OPTS Java Environment Options @@ -61,7 +61,7 @@ $ docker run -d --link selenium-hub:hub selenium/node-firefox:3.0.1-carbon 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-carbon +$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.0.1-dysprosium ``` ### 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:3.0.1-carbon +$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:3.0.1-dysprosium ``` ## 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:3.0.1-carbon +$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.0.1-dysprosium $ CH=$(docker run --rm --name=ch \ --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \ - selenium/node-chrome:3.0.1-carbon) + selenium/node-chrome:3.0.1-dysprosium) ``` _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-carbon +$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.0.1-dysprosium $ FF=$(docker run --rm --name=fx \ --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \ - selenium/node-firefox:3.0.1-carbon) + selenium/node-firefox:3.0.1-dysprosium) ``` _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-carbon -$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-carbon +$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-dysprosium +$ docker run -d -P -p :5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-dysprosium ``` e.g.: ``` bash -$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-carbon -$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-carbon +$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-dysprosium +$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-dysprosium ``` 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-carbon +$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-chrome-debug:3.0.1-dysprosium # OR -$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-firefox-debug:3.0.1-carbon +$ docker run -d -p 4444:4444 -p :5900 selenium/standalone-firefox-debug:3.0.1-dysprosium ``` or ``` bash -$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.0.1-carbon +$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.0.1-dysprosium # OR -$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.0.1-carbon +$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.0.1-dysprosium ``` 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-carbon -#FROM selenium/node-firefox-debug:3.0.1-carbon +#FROM selenium/node-chrome-debug:3.0.1-dysprosium +#FROM selenium/node-firefox-debug:3.0.1-dysprosium #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 3.0.1-carbon 69f762d0d79e 29 minutes ago 552.1 MB -selenium/node-chrome 3.0.1-carbon 9dd73160660b 30 minutes ago 723.6 MB -selenium/node-base 3.0.1-carbon 1b7a0b7024b1 32 minutes ago 426.1 MB -selenium/hub 3.0.1-carbon 2570bbb98229 33 minutes ago 394.4 MB -selenium/base 3.0.1-carbon 33478d455dab 33 minutes ago 362.6 MB +selenium/node-firefox 3.0.1-dysprosium 69f762d0d79e 29 minutes ago 552.1 MB +selenium/node-chrome 3.0.1-dysprosium 9dd73160660b 30 minutes ago 723.6 MB +selenium/node-base 3.0.1-dysprosium 1b7a0b7024b1 32 minutes ago 426.1 MB +selenium/hub 3.0.1-dysprosium 2570bbb98229 33 minutes ago 394.4 MB +selenium/base 3.0.1-dysprosium 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 30d0876bb..0da6a5a50 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.0.1-carbon +FROM selenium/node-chrome:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/StandaloneChromeDebug/Dockerfile b/StandaloneChromeDebug/Dockerfile index 438e945b8..2121363e2 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.0.1-carbon +FROM selenium/standalone-chrome:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile index 79860f3aa..ee5e371a0 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.0.1-carbon +FROM selenium/node-firefox:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/StandaloneFirefoxDebug/Dockerfile b/StandaloneFirefoxDebug/Dockerfile index 44edc365c..8bf47bd8e 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.0.1-carbon +FROM selenium/standalone-firefox:3.0.1-dysprosium MAINTAINER Selenium USER root diff --git a/sa-test.sh b/sa-test.sh index d6f391d22..4762d6454 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-carbon) + SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:3.0.1-dysprosium) SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::) TEST_CMD="node smoke-$BROWSER.js" diff --git a/test.sh b/test.sh index b536d706c..08a5a42b2 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:3.0.1-carbon) +HUB=$(docker run -d selenium/hub:3.0.1-dysprosium) 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:3.0.1-carbon) +NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:3.0.1-dysprosium) echo 'Starting Selenium Firefox node...' -NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:3.0.1-carbon) +NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:3.0.1-dysprosium) docker logs -f $NODE_CHROME & docker logs -f $NODE_FIREFOX & echo 'Waiting for nodes to register and come online...'