Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit d0744ef

Browse files
committed
Upgrade Ubuntu wily 20151208, Chrome 47.0.2526.80
1 parent 303c02b commit d0744ef

File tree

5 files changed

+59
-41
lines changed

5 files changed

+59
-41
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@ Note image ids also change after scm-source.json has being updated which trigger
77
###### To get container versions
88
docker exec grid versions
99

10+
## 2.48.2f (2015-12-09)
11+
+ Upgrade Ubuntu wily from 20151019 to 20151208
12+
+ Upgrade Chrome to 47.0.2526.80
13+
+ Image tag details:
14+
+ Selenium: v2.48.2 (41bccdd)
15+
+ Chrome stable: 47.0.2526.80
16+
+ Firefox stable: 42.0
17+
+ Chromedriver: 2.20.353124 (035346203162d32c80f1dce587c8154a1efa0c3b)
18+
+ Java: 1.8.0_66-internal OpenJDK 64-Bit 1.8.0_66-b01
19+
+ Timezone: Europe/Berlin
20+
+ Built with: Docker version 1.9.1, build a34a1d5
21+
+ FROM ubuntu:wily-20151019
22+
+ Python: 2.7.10
23+
+ Sauce Connect 4.3.12, build 1788 abd6986
24+
+ BrowserStack Local version 4.1
25+
+ Image ID: TBD
26+
+ Digest: sha256:TBD
27+
1028
## 2.48.2e (2015-12-02)
1129
+ Upgrade Chrome to 47.0.2526.73
1230
+ Image tag details:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#== Ubuntu wily is 15.10.x, i.e. FROM ubuntu:15.10
55
# search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
66
# next: wily-TBD
7-
FROM ubuntu:wily-20151019
7+
FROM ubuntu:wily-20151208
88
ENV UBUNTU_FLAVOR wily
99

1010
#== Ubuntu vivid is 15.04.x, i.e. FROM ubuntu:15.04
@@ -629,7 +629,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
629629
# TODO: Use Google fingerprint to verify downloads
630630
# http://www.google.de/linuxrepositories/
631631
# Also fix .deb file names with correct version
632-
RUN latest_chrome_version_trigger="latest" \
632+
RUN latest_chrome_version_trigger="47.0.2526.80" \
633633
&& mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
634634
&& export CHROME_URL="https://dl.google.com/linux/direct" \
635635
&& wget --no-verbose -O \

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ Note SeleniumHQ/docker-selenium project is more useful for building selenium gri
2222

2323
In general add `sudo` only if needed in your environment and `--privileged` or `-v /dev/shm:/dev/shm` if you really need it like when [Chrome crashes](https://github.com/elgalu/docker-selenium/issues/20) during your high gpu intensive tests.
2424

25-
docker pull elgalu/selenium:2.48.2e
25+
docker pull elgalu/selenium:2.48.2f
2626

2727
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 \
28-
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.48.2e
28+
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.48.2f
2929

3030
Make sure `docker run` finishes with **selenium all done and ready for testing** else you won't be able to start your tests. To perform this check programatically please use this command where `grid` is the name of the container:
3131

@@ -64,12 +64,12 @@ Supervisor exposes an http server but is not enough to bind the ports via `docke
6464
### Screen size
6565
You can set a custom screen size at docker run time by providing `SCREEN_WIDTH` and `SCREEN_HEIGHT` environment variables:
6666

67-
docker pull elgalu/selenium:2.48.2e
67+
docker pull elgalu/selenium:2.48.2f
6868

6969
docker run -d --name=grid -p 4444:24444 -p 5920:25900 \
7070
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
7171
-e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1480 \
72-
elgalu/selenium:2.48.2e
72+
elgalu/selenium:2.48.2f
7373

7474
docker exec grid wait_all_done 10s
7575

@@ -123,7 +123,7 @@ You need to pass the environment variable `-e NOVNC=true` in order to start the
123123

124124
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 \
125125
-p 6080:26080 -e NOVNC=true \
126-
elgalu/selenium:2.48.2e
126+
elgalu/selenium:2.48.2f
127127

128128
If the VNC password was randomly generated find out with
129129

@@ -136,7 +136,7 @@ If the VNC password was randomly generated find out with
136136
You can launch a grid only container via environment variables:
137137

138138
docker run --rm --name=hub -p 4444:24444 -p 5930:25900 \
139-
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.48.2e
139+
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.48.2f
140140

141141
The important part above is `-e CHROME=false -e FIREFOX=false` which tells the docker image not run run default chorme and firefox nodes turning the container into a grid-only one.
142142

@@ -150,7 +150,7 @@ You can lunch a node only container via environment variables:
150150
-e SELENIUM_HUB_PORT=4444 \
151151
-e SELENIUM_NODE_HOST=docker.host \
152152
-e GRID=false -e CHROME=true -e FIREFOX=true \
153-
elgalu/selenium:2.48.2e
153+
elgalu/selenium:2.48.2f
154154

155155
The important part above is `-e GRID=false` which tells the container to be a node-only node, this this case with 2 browsers `-e CHROME=true -e FIREFOX=true` but could be just 1.
156156

@@ -164,7 +164,7 @@ Start the grid with Chrome and Firefox
164164
-e SELENIUM_NODE_CH_PORT=25010 -e SELENIUM_NODE_FF_PORT=26010 \
165165
-e GRID=true -e CHROME=true -e FIREFOX=true \
166166
-e VNC_PASSWORD=hola -e VNC_PORT=5810 \
167-
-v /dev/shm:/dev/shm elgalu/selenium:2.48.2e
167+
-v /dev/shm:/dev/shm elgalu/selenium:2.48.2f
168168

169169
Add another docker container node with 2 more browsers:
170170

@@ -174,7 +174,7 @@ Add another docker container node with 2 more browsers:
174174
-e SELENIUM_NODE_CH_PORT=25020 -e SELENIUM_NODE_FF_PORT=26020 \
175175
-e GRID=false -e CHROME=true -e FIREFOX=true \
176176
-e VNC_PASSWORD=hola -e VNC_PORT=5820 \
177-
-v /dev/shm:/dev/shm elgalu/selenium:2.48.2e
177+
-v /dev/shm:/dev/shm elgalu/selenium:2.48.2f
178178

179179
And another
180180

@@ -184,7 +184,7 @@ And another
184184
-e SELENIUM_NODE_CH_PORT=25030 -e SELENIUM_NODE_FF_PORT=26030 \
185185
-e GRID=false -e CHROME=true -e FIREFOX=true \
186186
-e VNC_PASSWORD=hola -e VNC_PORT=5830 \
187-
-v /dev/shm:/dev/shm elgalu/selenium:2.48.2e
187+
-v /dev/shm:/dev/shm elgalu/selenium:2.48.2f
188188

189189
## Chrome crashed
190190

@@ -223,9 +223,9 @@ There are also additional steps you can take to ensure you're using the correct
223223

224224
You can simply verify that image id is indeed the correct one.
225225

226-
# e.g. full image id for tag 2.48.2e
226+
# e.g. full image id for tag 2.48.2f
227227
export IMGID="<<Please see CHANGELOG.md>>"
228-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.48.2e |grep ${IMGID} &> /dev/null; then
228+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.48.2f |grep ${IMGID} &> /dev/null; then
229229
echo "Image ID tested ok"
230230
else
231231
echo "Image ID doesn't match"
@@ -235,7 +235,7 @@ You can simply verify that image id is indeed the correct one.
235235

236236
Given docker.io currently allows to push the same tag image twice this represent a security concern but since docker >= 1.6.2 is possible to fetch the digest sha256 instead of the tag so you can be sure you're using the exact same docker image every time:
237237

238-
# e.g. sha256 for tag 2.48.2e
238+
# e.g. sha256 for tag 2.48.2f
239239
export SHA=<<Please see CHANGELOG.md>>
240240
docker pull elgalu/selenium@sha256:${SHA}
241241

@@ -261,7 +261,7 @@ Host machine, terminal 2:
261261
docker run --rm --name=ch -p=4444:24444 \
262262
-e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
263263
-v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
264-
elgalu/selenium:2.48.2e
264+
elgalu/selenium:2.48.2f
265265

266266
Now when you run your tests instead of connecting. If docker run fails try `xhost +`
267267

@@ -283,7 +283,7 @@ ANYPORT=0
283283
REMOTE_DOCKER_SRV=localhost
284284
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
285285
-p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
286-
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.48.2e
286+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.48.2f
287287
288288
# -- Option 2.docker run- Running docker on remote docker server like in the cloud
289289
# Useful if the docker server is running in the cloud. Establish free local ports
@@ -293,7 +293,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
293293
# it acts as a jump host so my public key is already on that server
294294
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
295295
-e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
296-
elgalu/selenium:2.48.2e
296+
elgalu/selenium:2.48.2f
297297
298298
# -- Common: Wait for the container to start
299299
./host-scripts/wait-docker-selenium.sh grid 7s
@@ -364,7 +364,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
364364
365365
If you prefer to download the final built image from docker you can pull it, personally I always prefer to build them manually except for the base images like Ubuntu 14.04.2:
366366
367-
docker pull elgalu/selenium:2.48.2e
367+
docker pull elgalu/selenium:2.48.2f
368368
369369
#### 2. Use this image
370370

READMELeo.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Build
22

3-
time (docker build -t="elgalu/selenium:2.48.2e" . ;echo $?;beep)
4-
docker run --rm -ti -m 4000M --cpu-quota=0 --name=grid -p=4444:24444 -p=5920:25900 -p=2222:22222 -e DISABLE_ROLLBACK=true -e VIDEO=true -e MEM_JAVA="1024m" -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" -v /dev/shm:/dev/shm elgalu/selenium:2.48.2e
3+
time (docker build -t="elgalu/selenium:2.48.2f" . ;echo $?;beep)
4+
docker run --rm -ti -m 4000M --cpu-quota=0 --name=grid -p=4444:24444 -p=5920:25900 -p=2222:22222 -e DISABLE_ROLLBACK=true -e VIDEO=true -e MEM_JAVA="1024m" -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" -v /dev/shm:/dev/shm elgalu/selenium:2.48.2f
55

66
Wait
77

@@ -13,17 +13,17 @@ Copy
1313

1414
Build a grid with extra nodes
1515

16-
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.48.2e
16+
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.48.2f
1717

18-
docker run --rm --name=node -e DISP_N=13 -e SSHD_PORT=22223 -e SUPERVISOR_HTTP_PORT=29003 -e VNC_PORT=25903 -e SELENIUM_NODE_CH_PORT=25330 -e SELENIUM_NODE_FF_PORT=25331 -e GRID=false -e CHROME=true -e FIREFOX=true --net=container:grid elgalu/selenium:2.48.2e
18+
docker run --rm --name=node -e DISP_N=13 -e SSHD_PORT=22223 -e SUPERVISOR_HTTP_PORT=29003 -e VNC_PORT=25903 -e SELENIUM_NODE_CH_PORT=25330 -e SELENIUM_NODE_FF_PORT=25331 -e GRID=false -e CHROME=true -e FIREFOX=true --net=container:grid elgalu/selenium:2.48.2f
1919

2020
See logs
2121

2222
docker exec -ti grid bash -c "ls -lah /var/log/sele/"
2323

2424
Testing in ssh [email protected]
2525

26-
docker run --rm --name=grid -p=4444:24444 -p=5920:25900 -p=2222:22222 -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" -e VNC_PASSWORD=Hola3 os-registry.stups.zalan.do/tip/selenium:2.48.2e
26+
docker run --rm --name=grid -p=4444:24444 -p=5920:25900 -p=2222:22222 -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" -e VNC_PASSWORD=Hola3 os-registry.stups.zalan.do/tip/selenium:2.48.2f
2727

2828
## Transfer used browser source artifacts to keep them in the cloud
2929

@@ -46,18 +46,18 @@ List firefox versions via docker exe
4646

4747
## To update image id and digest
4848

49-
docker inspect -f='{{.Id}}' elgalu/selenium:2.48.2e
49+
docker inspect -f='{{.Id}}' elgalu/selenium:2.48.2f
5050
docker images --digests
5151

5252
## Run with shared dir
5353

5454
docker run --rm --name=grid -p=127.0.0.1:4460:24444 -p=127.0.0.1:5910:25900 \
55-
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.48.2e
55+
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.48.2f
5656
docker run --rm --name=grid -p=4460:24444 -p=5910:25900 \
57-
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.48.2e
57+
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.48.2f
5858

5959

60-
docker run --rm --name=ff -p=127.0.0.1:4461:24444 -p=127.0.0.1:5911:25900 -v /e2e/uploads:/e2e/uploads elgalu/selenium:2.48.2e
60+
docker run --rm --name=ff -p=127.0.0.1:4461:24444 -p=127.0.0.1:5911:25900 -v /e2e/uploads:/e2e/uploads elgalu/selenium:2.48.2f
6161

6262
## Run without shared dir and bind ports to all network interfaces
6363

@@ -80,11 +80,11 @@ List firefox versions via docker exe
8080
## Run without dir and bind to all interfaces
8181
Note anything after the image will be taken as arguments for the cmd/entrypoint
8282

83-
docker run --rm --name=grid -p=0.0.0.0:8813:8484 -p=0.0.0.0:2222:2222 -p=0.0.0.0:4470:24444 -p=0.0.0.0:5920:25900 -e SCREEN_WIDTH=1800 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.48.2e
83+
docker run --rm --name=grid -p=0.0.0.0:8813:8484 -p=0.0.0.0:2222:2222 -p=0.0.0.0:4470:24444 -p=0.0.0.0:5920:25900 -e SCREEN_WIDTH=1800 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.48.2f
8484

85-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.48.2e
86-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.48.2e
87-
docker run --rm --name=grid -p=0.0.0.0:4470:24444 -p=0.0.0.0:5920:25900 --add-host myserver.dev:172.17.42.1 elgalu/selenium:2.48.2e
85+
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.48.2f
86+
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.48.2f
87+
docker run --rm --name=grid -p=0.0.0.0:4470:24444 -p=0.0.0.0:5920:25900 --add-host myserver.dev:172.17.42.1 elgalu/selenium:2.48.2f
8888

8989
However adding a custom host IP to server-selenium.local (e.g. bsele ssh config) is more work:
9090

@@ -93,30 +93,30 @@ However adding a custom host IP to server-selenium.local (e.g. bsele ssh config)
9393

9494
vncv localhost:5920 -Scaling=60% &
9595

96-
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.48.2e
96+
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.48.2f
9797

9898
Automatic builds not working for me right now, maybe there is an issue with docker registry v1 vs v2
9999
https://registry.hub.docker.com/u/elgalu/docker-selenium/builds_history/31621/
100100

101101
## Push version
102102

103103
docker login
104-
docker push docker.io/elgalu/selenium:2.48.2e ;echo $?;beep
104+
docker push docker.io/elgalu/selenium:2.48.2f ;echo $?;beep
105105

106106
Not working maybe because it has automated builds enabled but then it fails in the cloud but works locally
107107
https://registry.hub.docker.com/u/elgalu/selenium/tags/manage/
108108

109-
docker push elgalu/selenium:2.48.2e
110-
docker push elgalu/docker-selenium:2.48.2e
111-
docker push docker.io/elgalu/docker-selenium:2.48.2e
109+
docker push elgalu/selenium:2.48.2f
110+
docker push elgalu/docker-selenium:2.48.2f
111+
docker push docker.io/elgalu/docker-selenium:2.48.2f
112112

113113
## Pulling
114114

115-
docker pull registry.hub.docker.com/elgalu/selenium:2.48.2e
115+
docker pull registry.hub.docker.com/elgalu/selenium:2.48.2f
116116

117117
## Pull
118118

119-
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.48.2e
119+
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.48.2f
120120

121121
How to connect through vnc (need a vnc client)
122122

docs/videos.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
### Pull
66
Pull image
77

8-
docker pull elgalu/selenium:2.48.2e
8+
docker pull elgalu/selenium:2.48.2f
99

1010
### Run
1111
Run a new grid
1212

1313
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 \
1414
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
15-
-e VIDEO=true elgalu/selenium:2.48.2e
15+
-e VIDEO=true elgalu/selenium:2.48.2f
1616

1717
### Wait
1818
Wait for the grid to start

0 commit comments

Comments
 (0)