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

Commit f7327a7

Browse files
committed
Upgrade Chrome to 48.0.2564.116
1 parent 09af275 commit f7327a7

File tree

5 files changed

+59
-42
lines changed

5 files changed

+59
-42
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.52.0c (2016-02-19)
11+
+ Upgrade Chrome to 48.0.2564.116
12+
+ Image tag details:
13+
+ Selenium: v2.52.0 (4c2593c)
14+
+ Chrome stable: 48.0.2564.116
15+
+ Firefox stable: 44.0.2
16+
+ Chromedriver: 2.21.371461 (633e689b520b25f3e264a2ede6b74ccc23cb636a)
17+
+ Java: 1.8.0_72-internal OpenJDK 64-Bit 1.8.0_72-b15
18+
+ Timezone: Europe/Berlin
19+
+ Built with: Docker version 1.9.1, build a34a1d5
20+
+ Tested on kernel host: 4.2.0-29-generic x86_64 GNU/Linux
21+
+ FROM ubuntu:xenial-20160217.2
22+
+ Python: 2.7.11
23+
+ Sauce Connect 4.3.13, build 1877 d9e5947
24+
+ BrowserStack Local version 4.7
25+
+ Image ID: TBD
26+
+ Digest: sha256:TBD
27+
1028
## 2.52.0b (2016-02-18)
1129
+ Upgrade Ubuntu xenial to 20160217.2
1230
+ Image tag details:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
663663
# TODO: Use Google fingerprint to verify downloads
664664
# http://www.google.de/linuxrepositories/
665665
# Also fix .deb file names with correct version
666-
RUN latest_chrome_version_trigger="48.0.2564.109" \
666+
RUN latest_chrome_version_trigger="48.0.2564.116" \
667667
&& mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
668668
&& export CHROME_URL="https://dl.google.com/linux/direct" \
669669
&& wget --no-verbose -O \

README.md

Lines changed: 12 additions & 12 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.52.0b
25+
docker pull elgalu/selenium:2.52.0c
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.52.0b
28+
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.52.0c
2929

3030
Make sure `docker run` finishes via active wait with below command. Note `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.52.0b
67+
docker pull elgalu/selenium:2.52.0c
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.52.0b
72+
elgalu/selenium:2.52.0c
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.52.0b
126+
elgalu/selenium:2.52.0c
127127

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

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

191191
You can simply verify that image id is indeed the correct one.
192192

193-
# e.g. full image id for tag 2.52.0b
193+
# e.g. full image id for tag 2.52.0c
194194
export IMGID="<<Please see CHANGELOG.md>>"
195-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0b |grep ${IMGID} &> /dev/null; then
195+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0c |grep ${IMGID} &> /dev/null; then
196196
echo "Image ID tested ok"
197197
else
198198
echo "Image ID doesn't match"
@@ -202,7 +202,7 @@ You can simply verify that image id is indeed the correct one.
202202

203203
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:
204204

205-
# e.g. sha256 for tag 2.52.0b
205+
# e.g. sha256 for tag 2.52.0c
206206
export SHA=<<Please see CHANGELOG.md>>
207207
docker pull elgalu/selenium@sha256:${SHA}
208208

@@ -228,7 +228,7 @@ Host machine, terminal 2:
228228
docker run --rm --name=ch -p=4444:24444 \
229229
-e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
230230
-v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
231-
elgalu/selenium:2.52.0b
231+
elgalu/selenium:2.52.0c
232232

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

@@ -250,7 +250,7 @@ ANYPORT=0
250250
REMOTE_DOCKER_SRV=localhost
251251
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
252252
-p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
253-
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.52.0b
253+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.52.0c
254254
255255
# -- Option 2.docker run- Running docker on remote docker server like in the cloud
256256
# Useful if the docker server is running in the cloud. Establish free local ports
@@ -260,7 +260,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
260260
# it acts as a jump host so my public key is already on that server
261261
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
262262
-e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
263-
elgalu/selenium:2.52.0b
263+
elgalu/selenium:2.52.0c
264264
265265
# -- Common: Wait for the container to start
266266
./host-scripts/wait-docker-selenium.sh grid 7s
@@ -331,7 +331,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
331331
332332
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:
333333
334-
docker pull elgalu/selenium:2.52.0b
334+
docker pull elgalu/selenium:2.52.0c
335335
336336
#### 2. Use this image
337337

READMELeo.md

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

3-
time (docker build -t="elgalu/selenium:2.52.0b" . ;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.52.0b
3+
time (docker build -t="elgalu/selenium:2.52.0c" . ;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.52.0c
55

66
Wait and id
77

@@ -10,19 +10,18 @@ Wait and id
1010

1111
Chrome artifact
1212

13-
VER="48.0.2564.109"
13+
VER="48.0.2564.116"
1414
wget -nv --show-progress -O binaries/google-chrome-stable_${VER}_amd64.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
1515
#old: docker cp grid:/home/application/chrome-deb/. binaries/
1616

1717
## Push
1818

19-
docker push elgalu/selenium:2.52.0b ;echo $?;beep
20-
docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0b | xclip -sel clip
19+
docker push elgalu/selenium:2.52.0c ;echo $?;beep
20+
docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0c | xclip -sel clip
2121
# also grab digest and update CHANGELOG.md
22-
git add CHANGELOG.md && gci "2.52.0b: Update image id and digest"
23-
docker tag elgalu/selenium:2.52.0b elgalu/selenium:latest
24-
docker push elgalu/selenium:latest
25-
git tag 2.52.0b && git tag -f latest && git push && git push --tags -f
22+
git add CHANGELOG.md && gci "2.52.0c: Update image id and digest"
23+
docker tag elgalu/selenium:2.52.0c elgalu/selenium:latest
24+
docker push elgalu/selenium:latest && git tag 2.52.0c && git tag -f latest && git push && git push --tags -f
2625

2726
Location of binaries, e.g.
2827

@@ -37,9 +36,9 @@ Push setup, first time only:
3736

3837
Build a grid with extra nodes
3938

40-
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.52.0b
39+
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.52.0c
4140

42-
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.52.0b
41+
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.52.0c
4342

4443
See logs
4544

@@ -66,18 +65,18 @@ List firefox versions via docker exe
6665

6766
## To update image id and digest
6867

69-
docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0b
68+
docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0c
7069
docker images --digests
7170

7271
## Run with shared dir
7372

7473
docker run --rm --name=grid -p=127.0.0.1:4460:24444 -p=127.0.0.1:5910:25900 \
75-
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.52.0b
74+
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.52.0c
7675
docker run --rm --name=grid -p=4460:24444 -p=5910:25900 \
77-
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.52.0b
76+
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.52.0c
7877

7978

80-
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.52.0b
79+
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.52.0c
8180

8281
## Run without shared dir and bind ports to all network interfaces
8382

@@ -100,11 +99,11 @@ List firefox versions via docker exe
10099
## Run without dir and bind to all interfaces
101100
Note anything after the image will be taken as arguments for the cmd/entrypoint
102101

103-
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.52.0b
102+
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.52.0c
104103

105-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.52.0b
106-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.52.0b
107-
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.52.0b
104+
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.52.0c
105+
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.52.0c
106+
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.52.0c
108107

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

@@ -113,18 +112,18 @@ However adding a custom host IP to server-selenium.local (e.g. bsele ssh config)
113112

114113
vncv localhost:5920 -Scaling=60% &
115114

116-
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.52.0b
115+
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.52.0c
117116

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

121120
## Pulling
122121

123-
docker pull registry.hub.docker.com/elgalu/selenium:2.52.0b
122+
docker pull registry.hub.docker.com/elgalu/selenium:2.52.0c
124123

125124
## Pull
126125

127-
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.52.0b
126+
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.52.0c
128127

129128
How to connect through vnc (need a vnc client)
130129

@@ -333,7 +332,7 @@ https://github.com/rogaha/docker-desktop/blob/master/Dockerfile#L38
333332
You can launch a grid only container via environment variables:
334333

335334
docker run --rm --name=hub -p 4444:24444 -p 5930:25900 \
336-
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.52.0b
335+
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.52.0c
337336

338337
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.
339338

@@ -347,7 +346,7 @@ You can lunch a node only container via environment variables:
347346
-e SELENIUM_HUB_PORT=4444 \
348347
-e SELENIUM_NODE_HOST=docker.host \
349348
-e GRID=false -e CHROME=true -e FIREFOX=true \
350-
elgalu/selenium:2.52.0b
349+
elgalu/selenium:2.52.0c
351350

352351
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.
353352

@@ -361,7 +360,7 @@ Start the grid with Chrome and Firefox
361360
-e SELENIUM_NODE_CH_PORT=25010 -e SELENIUM_NODE_FF_PORT=26010 \
362361
-e GRID=true -e CHROME=true -e FIREFOX=true \
363362
-e VNC_PASSWORD=hola -e VNC_PORT=5810 \
364-
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0b
363+
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0c
365364

366365
Add another docker container node with 2 more browsers:
367366

@@ -371,7 +370,7 @@ Add another docker container node with 2 more browsers:
371370
-e SELENIUM_NODE_CH_PORT=25020 -e SELENIUM_NODE_FF_PORT=26020 \
372371
-e GRID=false -e CHROME=true -e FIREFOX=true \
373372
-e VNC_PASSWORD=hola -e VNC_PORT=5820 \
374-
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0b
373+
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0c
375374

376375
And another
377376

@@ -381,4 +380,4 @@ And another
381380
-e SELENIUM_NODE_CH_PORT=25030 -e SELENIUM_NODE_FF_PORT=26030 \
382381
-e GRID=false -e CHROME=true -e FIREFOX=true \
383382
-e VNC_PASSWORD=hola -e VNC_PORT=5830 \
384-
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0b
383+
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0c

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.52.0b
8+
docker pull elgalu/selenium:2.52.0c
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.52.0b
15+
-e VIDEO=true elgalu/selenium:2.52.0c
1616

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

0 commit comments

Comments
 (0)