Skip to content

Commit

Permalink
update to carbon.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddavison committed Dec 14, 2016
1 parent 0b734ab commit 4dcbab7
Show file tree
Hide file tree
Showing 18 changed files with 50 additions and 49 deletions.
3 changes: 2 additions & 1 deletion Hub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/base:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

#========================
Expand All @@ -11,6 +11,7 @@ MAINTAINER Selenium <[email protected]>

EXPOSE 4444

ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true
ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1
ENV GRID_JETTY_MAX_THREADS -1
ENV GRID_NODE_POLLING 5000
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
NAME := selenium
VERSION := $(or $(VERSION),$(VERSION),3.0.1-barium)
VERSION := $(or $(VERSION),$(VERSION),3.0.1-carbon)
PLATFORM := $(shell uname -s)
BUILD_ARGS := $(BUILD_ARGS)
MAJOR:=$(word 1,$(subst ., ,$(VERSION)))
MINOR:=$(word 2,$(subst ., ,$(VERSION)))
MAJOR := $(word 1,$(subst ., ,$(VERSION)))
MINOR := $(word 2,$(subst ., ,$(VERSION)))

all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug

Expand Down Expand Up @@ -110,7 +110,7 @@ tag_major_minor:
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR)
docker tag $(NAME)/standalone-firefox:$(VERSION) $(NAME)/standalone-firefox:$(MAJOR)
docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:$(MAJOR)
docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:$(MAJOR)
docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:$(MAJOR)
docker tag $(NAME)/base:$(VERSION) $(NAME)/base:$(MAJOR).$(MINOR)
docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:$(MAJOR).$(MINOR)
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/base:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

ENV DEBIAN_FRONTEND noninteractive
Expand Down
2 changes: 1 addition & 1 deletion NodeChrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/node-base:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeChromeDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/node-chrome:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeChromeDebug/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-aluminum
FROM selenium/node-chrome-debug:3.0.1-carbon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
2 changes: 1 addition & 1 deletion NodeDebug/README.template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-aluminum
FROM selenium/##BASE##-debug:3.0.1-carbon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/node-base:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefoxDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/node-firefox:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefoxDebug/Dockerfile.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM selenium/node-firefox:3.0.1-aluminum
FROM selenium/node-firefox:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion NodeFirefoxDebug/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-aluminum
FROM selenium/node-firefox-debug:3.0.1-carbon

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
```
Expand Down
54 changes: 27 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-aluminum
$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.0.1-carbon
```

This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952
Expand All @@ -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-aluminum
$ docker run -d -p 4444:4444 selenium/standalone-chrome:3.0.1-carbon
# OR
$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.0.1-aluminum
$ docker run -d -p 4444:4444 selenium/standalone-firefox:3.0.1-carbon
```

_Note: Only one standalone image can run on port_ `4444` _at a time._
Expand All @@ -46,30 +46,30 @@ 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-aluminum
$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:3.0.1-carbon
```

### Chrome and Firefox Grid Nodes

``` bash
$ docker run -d --link selenium-hub:hub selenium/node-chrome:3.0.1-aluminum
$ docker run -d --link selenium-hub:hub selenium/node-firefox:3.0.1-aluminum
$ 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
```

### JAVA_OPTS Java Environment Options

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-aluminum
$ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/hub:3.0.1-carbon
```

### SE_OPTS Selenium Configuration Options

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-aluminum
$ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:3.0.1-carbon
```

## Building the images
Expand Down Expand Up @@ -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-aluminum
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.0.1-carbon
$ CH=$(docker run --rm --name=ch \
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
selenium/node-chrome:3.0.1-aluminum)
selenium/node-chrome:3.0.1-carbon)
```

_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._
Expand All @@ -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-aluminum
$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:3.0.1-carbon
$ FF=$(docker run --rm --name=fx \
--link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
selenium/node-firefox:3.0.1-aluminum)
selenium/node-firefox:3.0.1-carbon)
```

_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/)._
Expand All @@ -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: <port4VNC>: 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 <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-aluminum
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-aluminum
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-carbon
$ docker run -d -P -p <port4VNC>:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-carbon
```
e.g.:
``` bash
$ docker run -d -P -p 5900:5900 --link selenium-hub:hub selenium/node-chrome-debug:3.0.1-aluminum
$ docker run -d -P -p 5901:5900 --link selenium-hub:hub selenium/node-firefox-debug:3.0.1-aluminum
$ 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
```

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 <port4VNC>:5900 selenium/standalone-chrome-debug:3.0.1-aluminum
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-chrome-debug:3.0.1-carbon
# OR
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:3.0.1-aluminum
$ docker run -d -p 4444:4444 -p <port4VNC>:5900 selenium/standalone-firefox-debug:3.0.1-carbon
```
or
``` bash
$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.0.1-aluminum
$ docker run -d -p 4444:4444 -p 5900:5900 selenium/standalone-chrome-debug:3.0.1-carbon
# OR
$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.0.1-aluminum
$ docker run -d -p 4444:4444 -p 5901:5900 selenium/standalone-firefox-debug:3.0.1-carbon
```

You can acquire the port that the VNC server is exposed to by running:
Expand All @@ -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-aluminum
#FROM selenium/node-firefox-debug:3.0.1-aluminum
#FROM selenium/node-chrome-debug:3.0.1-carbon
#FROM selenium/node-firefox-debug:3.0.1-carbon
#Choose the FROM statement that works for you.

RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
Expand All @@ -177,11 +177,11 @@ RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
$ docker images
#=>
REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
selenium/node-firefox 3.0.1-aluminum 69f762d0d79e 29 minutes ago 552.1 MB
selenium/node-chrome 3.0.1-aluminum 9dd73160660b 30 minutes ago 723.6 MB
selenium/node-base 3.0.1-aluminum 1b7a0b7024b1 32 minutes ago 426.1 MB
selenium/hub 3.0.1-aluminum 2570bbb98229 33 minutes ago 394.4 MB
selenium/base 3.0.1-aluminum 33478d455dab 33 minutes ago 362.6 MB
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
ubuntu 16.04 0b7735b9290f 6 days ago 123.7 MB
```

Expand Down
2 changes: 1 addition & 1 deletion StandaloneChrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/node-chrome:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion StandaloneChromeDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/standalone-chrome:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/node-firefox:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefoxDebug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-barium
FROM selenium/standalone-firefox:3.0.1-carbon
MAINTAINER Selenium <[email protected]>

USER root
Expand Down
2 changes: 1 addition & 1 deletion sa-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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-aluminum)
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:3.0.1-carbon)
SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::)
TEST_CMD="node smoke-$BROWSER.js"

Expand Down
6 changes: 3 additions & 3 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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-aluminum)
HUB=$(docker run -d selenium/hub:3.0.1-carbon)
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-aluminum)
NODE_CHROME=$(docker run -d --link $HUB_NAME:hub selenium/node-chrome$DEBUG:3.0.1-carbon)
echo 'Starting Selenium Firefox node...'
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:3.0.1-aluminum)
NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:3.0.1-carbon)
docker logs -f $NODE_CHROME &
docker logs -f $NODE_FIREFOX &
echo 'Waiting for nodes to register and come online...'
Expand Down

0 comments on commit 4dcbab7

Please sign in to comment.