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

Commit 150f487

Browse files
committed
Upgrade ubuntu:xenial-20160119.1 to 20160119, OpenJDK 1.8.0_72-b05 to b15
1 parent 8748b15 commit 150f487

File tree

5 files changed

+60
-42
lines changed

5 files changed

+60
-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.49.1b (2016-01-26)
11+
+ Upgrade ubuntu:xenial-20160119.1 to 20160119
12+
+ Upgrade OpenJDK 1.8.0_72-b05 to b15
13+
+ Image tag details:
14+
+ Selenium: v2.49.1 (7203e46)
15+
+ Chrome stable: 48.0.2564.82
16+
+ Firefox stable: 43.0.4
17+
+ Chromedriver: 2.20.353124 (035346203162d32c80f1dce587c8154a1efa0c3b)
18+
+ Java: 1.8.0_72-internal OpenJDK 64-Bit 1.8.0_72-b15
19+
+ Timezone: Europe/Berlin
20+
+ Built with: Docker version 1.9.1, build a34a1d5
21+
+ FROM ubuntu:xenial-20160119
22+
+ Python: 2.7.11
23+
+ Sauce Connect 4.3.13, build 1877 d9e5947
24+
+ BrowserStack Local version 4.4
25+
+ Image ID: TBD
26+
+ Digest: sha256:TBD
27+
1028
## 2.49.1a (2016-01-21)
1129
+ Upgrade Selenium to 2.49.1
1230
+ Upgrade Chrome to 48.0.2564.82

Dockerfile

Lines changed: 2 additions & 2 deletions
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-20160119.1
7+
FROM ubuntu:xenial-20160125
88
ENV UBUNTU_FLAVOR xenial
99

1010
#== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
@@ -569,7 +569,7 @@ RUN cd /tmp \
569569
# FIREFOX_VERSIONS 41 #
570570
#---------------------#
571571
# Latest available firefox version
572-
# this also works: ENV FIREFOX_LATEST_VERSION latest
572+
# this also used to work: ENV FIREFOX_LATEST_VERSION latest
573573
ENV FIREFOX_VERSIONS7 "43.0.4"
574574
RUN cd ${NORMAL_USER_HOME}/firefox-src \
575575
&& for FF_VER in $(echo ${FIREFOX_VERSIONS7} | tr "," "\n"); do \

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.49.1a
25+
docker pull elgalu/selenium:2.49.1b
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.49.1a
28+
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.49.1b
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.49.1a
67+
docker pull elgalu/selenium:2.49.1b
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.49.1a
72+
elgalu/selenium:2.49.1b
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.49.1a
126+
elgalu/selenium:2.49.1b
127127

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

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

174174
You can simply verify that image id is indeed the correct one.
175175

176-
# e.g. full image id for tag 2.49.1a
176+
# e.g. full image id for tag 2.49.1b
177177
export IMGID="<<Please see CHANGELOG.md>>"
178-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.49.1a |grep ${IMGID} &> /dev/null; then
178+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.49.1b |grep ${IMGID} &> /dev/null; then
179179
echo "Image ID tested ok"
180180
else
181181
echo "Image ID doesn't match"
@@ -185,7 +185,7 @@ You can simply verify that image id is indeed the correct one.
185185

186186
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:
187187

188-
# e.g. sha256 for tag 2.49.1a
188+
# e.g. sha256 for tag 2.49.1b
189189
export SHA=<<Please see CHANGELOG.md>>
190190
docker pull elgalu/selenium@sha256:${SHA}
191191

@@ -211,7 +211,7 @@ Host machine, terminal 2:
211211
docker run --rm --name=ch -p=4444:24444 \
212212
-e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
213213
-v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
214-
elgalu/selenium:2.49.1a
214+
elgalu/selenium:2.49.1b
215215

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

@@ -233,7 +233,7 @@ ANYPORT=0
233233
REMOTE_DOCKER_SRV=localhost
234234
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
235235
-p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
236-
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.49.1a
236+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.49.1b
237237
238238
# -- Option 2.docker run- Running docker on remote docker server like in the cloud
239239
# Useful if the docker server is running in the cloud. Establish free local ports
@@ -243,7 +243,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
243243
# it acts as a jump host so my public key is already on that server
244244
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
245245
-e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
246-
elgalu/selenium:2.49.1a
246+
elgalu/selenium:2.49.1b
247247
248248
# -- Common: Wait for the container to start
249249
./host-scripts/wait-docker-selenium.sh grid 7s
@@ -314,7 +314,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
314314
315315
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:
316316
317-
docker pull elgalu/selenium:2.49.1a
317+
docker pull elgalu/selenium:2.49.1b
318318
319319
#### 2. Use this image
320320

READMELeo.md

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

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

66
Wait and id
77

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

1717
Commit, rebuild, test and grab image Id
1818

19-
docker inspect -f='{{.Id}}' elgalu/selenium:2.49.1a | xclip -sel clip
19+
docker inspect -f='{{.Id}}' elgalu/selenium:2.49.1b | xclip -sel clip
2020

2121
## Push
2222

2323
rm -f ~/.docker/config.json && cp ~/.docker/config.pub.json ~/.docker/config.json
24-
docker push elgalu/selenium:2.49.1a ;echo $?;beep
24+
docker push elgalu/selenium:2.49.1b ;echo $?;beep
2525
# grab digest and update CHANGELOG.md
26-
git add CHANGELOG.md && gci "2.49.1a: Update image id and digest"
27-
docker tag -f elgalu/selenium:2.49.1a elgalu/selenium:latest
26+
git add CHANGELOG.md && gci "2.49.1b: Update image id and digest"
27+
docker tag -f elgalu/selenium:2.49.1b elgalu/selenium:latest
2828
docker push elgalu/selenium:latest
29-
git tag 2.49.1a && git tag -f latest && git push && git push --tags -f
29+
git tag 2.49.1b && git tag -f latest && git push && git push --tags -f
3030

3131
Location of binaries, e.g.
3232

@@ -41,17 +41,17 @@ Push setup, first time only:
4141

4242
Build a grid with extra nodes
4343

44-
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.49.1a
44+
docker run --rm --name=grid -p 4444:24444 -p 5920:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.49.1b
4545

46-
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.49.1a
46+
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.49.1b
4747

4848
See logs
4949

5050
docker exec -ti grid bash -c "ls -lah /var/log/sele/"
5151

5252
Testing in ssh [email protected]
5353

54-
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.49.1a
54+
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.49.1b
5555

5656
## Transfer used browser source artifacts to keep them in the cloud
5757

@@ -74,18 +74,18 @@ List firefox versions via docker exe
7474

7575
## To update image id and digest
7676

77-
docker inspect -f='{{.Id}}' elgalu/selenium:2.49.1a
77+
docker inspect -f='{{.Id}}' elgalu/selenium:2.49.1b
7878
docker images --digests
7979

8080
## Run with shared dir
8181

8282
docker run --rm --name=grid -p=127.0.0.1:4460:24444 -p=127.0.0.1:5910:25900 \
83-
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.49.1a
83+
-v /e2e/uploads:/e2e/uploads elgalu/selenium:2.49.1b
8484
docker run --rm --name=grid -p=4460:24444 -p=5910:25900 \
85-
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.49.1a
85+
-v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:2.49.1b
8686

8787

88-
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.49.1a
88+
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.49.1b
8989

9090
## Run without shared dir and bind ports to all network interfaces
9191

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

111-
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.49.1a
111+
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.49.1b
112112

113-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.49.1a
114-
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.49.1a
115-
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.49.1a
113+
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola elgalu/selenium:2.49.1b
114+
docker run --rm --name=grid -p=4470:24444 -p=5920:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:2.49.1b
115+
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.49.1b
116116

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

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

122122
vncv localhost:5920 -Scaling=60% &
123123

124-
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.49.1a
124+
docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:2.49.1b
125125

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

129129
## Pulling
130130

131-
docker pull registry.hub.docker.com/elgalu/selenium:2.49.1a
131+
docker pull registry.hub.docker.com/elgalu/selenium:2.49.1b
132132

133133
## Pull
134134

135-
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.49.1a
135+
docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:2.49.1b
136136

137137
How to connect through vnc (need a vnc client)
138138

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

343343
docker run --rm --name=hub -p 4444:24444 -p 5930:25900 \
344-
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.49.1a
344+
-e CHROME=false -e FIREFOX=false elgalu/selenium:2.49.1b
345345

346346
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.
347347

@@ -355,7 +355,7 @@ You can lunch a node only container via environment variables:
355355
-e SELENIUM_HUB_PORT=4444 \
356356
-e SELENIUM_NODE_HOST=docker.host \
357357
-e GRID=false -e CHROME=true -e FIREFOX=true \
358-
elgalu/selenium:2.49.1a
358+
elgalu/selenium:2.49.1b
359359

360360
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.
361361

@@ -369,7 +369,7 @@ Start the grid with Chrome and Firefox
369369
-e SELENIUM_NODE_CH_PORT=25010 -e SELENIUM_NODE_FF_PORT=26010 \
370370
-e GRID=true -e CHROME=true -e FIREFOX=true \
371371
-e VNC_PASSWORD=hola -e VNC_PORT=5810 \
372-
-v /dev/shm:/dev/shm elgalu/selenium:2.49.1a
372+
-v /dev/shm:/dev/shm elgalu/selenium:2.49.1b
373373

374374
Add another docker container node with 2 more browsers:
375375

@@ -379,7 +379,7 @@ Add another docker container node with 2 more browsers:
379379
-e SELENIUM_NODE_CH_PORT=25020 -e SELENIUM_NODE_FF_PORT=26020 \
380380
-e GRID=false -e CHROME=true -e FIREFOX=true \
381381
-e VNC_PASSWORD=hola -e VNC_PORT=5820 \
382-
-v /dev/shm:/dev/shm elgalu/selenium:2.49.1a
382+
-v /dev/shm:/dev/shm elgalu/selenium:2.49.1b
383383

384384
And another
385385

@@ -389,4 +389,4 @@ And another
389389
-e SELENIUM_NODE_CH_PORT=25030 -e SELENIUM_NODE_FF_PORT=26030 \
390390
-e GRID=false -e CHROME=true -e FIREFOX=true \
391391
-e VNC_PASSWORD=hola -e VNC_PORT=5830 \
392-
-v /dev/shm:/dev/shm elgalu/selenium:2.49.1a
392+
-v /dev/shm:/dev/shm elgalu/selenium:2.49.1b

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

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

0 commit comments

Comments
 (0)