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

Commit d88f8b9

Browse files
committed
Upgrade Ubuntu xenial to 20160217.2
1 parent d0e8b39 commit d88f8b9

File tree

5 files changed

+51
-51
lines changed

5 files changed

+51
-51
lines changed

CHANGELOG.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ 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.0a (2016-02-16)
11-
+ Upgrade Firefox to 44.0.2
12-
+ Upgrade Selenium to 2.52.0
10+
## 2.52.0b (2016-02-18)
11+
+ Upgrade Ubuntu xenial to 20160217.2
1312
+ Image tag details:
1413
+ Selenium: v2.52.0 (4c2593c)
1514
+ Chrome stable: 48.0.2564.109
1615
+ Firefox stable: 44.0.2
1716
+ Chromedriver: 2.21.371461 (633e689b520b25f3e264a2ede6b74ccc23cb636a)
1817
+ Java: 1.8.0_72-internal OpenJDK 64-Bit 1.8.0_72-b15
1918
+ Timezone: Europe/Berlin
20-
+ Built with: Docker version 1.10.1, build 9e83765
21-
+ FROM ubuntu:xenial-20160125
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
2222
+ Python: 2.7.11
2323
+ Sauce Connect 4.3.13, build 1877 d9e5947
2424
+ BrowserStack Local version 4.7
25-
+ Image ID: sha256:0c9c729f25f13fc2d8efddd0552fe888bd489708a6c429b29039c833cb508377
26-
+ Digest: sha256:d30709c36514d5fc92671f3c1f5aa0befdb84d84a05771fe76b68ee54492a482
25+
+ Image ID: TBD
26+
+ Digest: sha256:TBD
2727

28-
## 2.51.0c (2016-02-12)
28+
## 2.52.0a (2016-02-16)
2929
+ Upgrade Firefox to 44.0.2
3030
+ Upgrade Selenium to 2.52.0
3131
+ Image tag details:
@@ -35,13 +35,13 @@ Note image ids also change after scm-source.json has being updated which trigger
3535
+ Chromedriver: 2.21.371461 (633e689b520b25f3e264a2ede6b74ccc23cb636a)
3636
+ Java: 1.8.0_72-internal OpenJDK 64-Bit 1.8.0_72-b15
3737
+ Timezone: Europe/Berlin
38-
+ Built with: Docker version 1.9.1, build a34a1d5
38+
+ Built with: Docker version 1.10.1, build 9e83765
3939
+ FROM ubuntu:xenial-20160125
4040
+ Python: 2.7.11
4141
+ Sauce Connect 4.3.13, build 1877 d9e5947
4242
+ BrowserStack Local version 4.7
43-
+ Image ID: TBD
44-
+ Digest: sha256:TBD
43+
+ Image ID: sha256:0c9c729f25f13fc2d8efddd0552fe888bd489708a6c429b29039c833cb508377
44+
+ Digest: sha256:d30709c36514d5fc92671f3c1f5aa0befdb84d84a05771fe76b68ee54492a482
4545

4646
## 2.51.0b (2016-02-10)
4747
+ Upgrade Chrome to 48.0.2564.109

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
55
# search for more at https://registry.hub.docker.com/_/ubuntu/tags/manage/
66
# next: xenial-TBD
7-
FROM ubuntu:xenial-20160125
7+
FROM ubuntu:xenial-20160217.2
88
ENV UBUNTU_FLAVOR xenial
99

1010
#== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10

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.0a
25+
docker pull elgalu/selenium:2.52.0b
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.0a
28+
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.52.0b
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.0a
67+
docker pull elgalu/selenium:2.52.0b
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.0a
72+
elgalu/selenium:2.52.0b
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.0a
126+
elgalu/selenium:2.52.0b
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.0a
193+
# e.g. full image id for tag 2.52.0b
194194
export IMGID="<<Please see CHANGELOG.md>>"
195-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0a |grep ${IMGID} &> /dev/null; then
195+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0b |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.0a
205+
# e.g. sha256 for tag 2.52.0b
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.0a
231+
elgalu/selenium:2.52.0b
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.0a
253+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.52.0b
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.0a
263+
elgalu/selenium:2.52.0b
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.0a
334+
docker pull elgalu/selenium:2.52.0b
335335
336336
#### 2. Use this image
337337

READMELeo.md

Lines changed: 25 additions & 25 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.0a" . ;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.0a
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
55

66
Wait and id
77

@@ -16,13 +16,13 @@ Chrome artifact
1616

1717
## Push
1818

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

2727
Location of binaries, e.g.
2828

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

3838
Build a grid with extra nodes
3939

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.0a
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
4141

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.0a
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
4343

4444
See logs
4545

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

6767
## To update image id and digest
6868

69-
docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0a
69+
docker inspect -f='{{.Id}}' elgalu/selenium:2.52.0b
7070
docker images --digests
7171

7272
## Run with shared dir
7373

7474
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.0a
75+
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.52.0b
7676
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.0a
77+
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.52.0b
7878

7979

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.0a
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
8181

8282
## Run without shared dir and bind ports to all network interfaces
8383

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

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.0a
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
104104

105-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.52.0a
106-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.52.0a
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.0a
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
108108

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

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

114114
vncv localhost:5920 -Scaling=60% &
115115

116-
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.52.0a
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
117117

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

121121
## Pulling
122122

123-
docker pull registry.hub.docker.com/elgalu/selenium:2.52.0a
123+
docker pull registry.hub.docker.com/elgalu/selenium:2.52.0b
124124

125125
## Pull
126126

127-
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.52.0a
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
128128

129129
How to connect through vnc (need a vnc client)
130130

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

335335
docker run --rm --name=hub -p 4444:24444 -p 5930:25900 \
336-
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.52.0a
336+
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.52.0b
337337

338338
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.
339339

@@ -347,7 +347,7 @@ You can lunch a node only container via environment variables:
347347
-e SELENIUM_HUB_PORT=4444 \
348348
-e SELENIUM_NODE_HOST=docker.host \
349349
-e GRID=false -e CHROME=true -e FIREFOX=true \
350-
elgalu/selenium:2.52.0a
350+
elgalu/selenium:2.52.0b
351351

352352
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.
353353

@@ -361,7 +361,7 @@ Start the grid with Chrome and Firefox
361361
-e SELENIUM_NODE_CH_PORT=25010 -e SELENIUM_NODE_FF_PORT=26010 \
362362
-e GRID=true -e CHROME=true -e FIREFOX=true \
363363
-e VNC_PASSWORD=hola -e VNC_PORT=5810 \
364-
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0a
364+
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0b
365365

366366
Add another docker container node with 2 more browsers:
367367

@@ -371,7 +371,7 @@ Add another docker container node with 2 more browsers:
371371
-e SELENIUM_NODE_CH_PORT=25020 -e SELENIUM_NODE_FF_PORT=26020 \
372372
-e GRID=false -e CHROME=true -e FIREFOX=true \
373373
-e VNC_PASSWORD=hola -e VNC_PORT=5820 \
374-
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0a
374+
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0b
375375

376376
And another
377377

@@ -381,4 +381,4 @@ And another
381381
-e SELENIUM_NODE_CH_PORT=25030 -e SELENIUM_NODE_FF_PORT=26030 \
382382
-e GRID=false -e CHROME=true -e FIREFOX=true \
383383
-e VNC_PASSWORD=hola -e VNC_PORT=5830 \
384-
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0a
384+
-v /dev/shm:/dev/shm elgalu/selenium:2.52.0b

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

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

0 commit comments

Comments
 (0)