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

Commit 576f085

Browse files
committed
Chrome 50.0.2661.102, mp4 html5 playback
1 parent 08e149f commit 576f085

File tree

6 files changed

+55
-37
lines changed

6 files changed

+55
-37
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,30 @@ 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+
## TBD_DOCKER_TAG
11+
+ Date: TBD_DATE
12+
+ Upgrade Chrome patch to 50.0.2661.102
13+
+ Add mp4 playback ability in firefox for html5 @Z3r0Sum
14+
+ Travis skip tmp branches
15+
+ Image tag details:
16+
+ Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
17+
+ Chrome stable: TBD_CHROME_STABLE
18+
+ Firefox stable: TBD_FIREFOX_STABLE
19+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
20+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
21+
+ Timezone: TBD_TIME_ZONE
22+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
23+
+ Python: TBD_PYTHON_VERSION
24+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
25+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
26+
+ Tested on kernel dev host: 4.4.0-22-generic x86_64
27+
+ Tested on kernel CI host: TBD_HOST_UNAME
28+
+ Built at dev host with: Docker version 1.11.0, build 4dc5990
29+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
30+
+ Image size: TBD_IMAGE_SIZE
31+
+ Digest: TBD_DIGEST
32+
+ Image ID: TBD_IMAGE_ID
33+
1034
## 2.53.0l
1135
+ Date: 2016-05-04
1236
+ Upgrade Firefox patch to 46.0.1

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ For pull requests:
55

66
./test/before_install_build && ./test/install
77
./test/script
8-
./test/after_script #or: docker exec grid versions
8+
docker exec grid versions && ./test/after_script
99
open ./images/grid_console.png #to verify the versions are correct
1010
git checkout ./images/grid_console.png && open ./videos/chrome/test.mkv
1111
travis lint #if you changed .travis.yml
12-
git checkout -b tmp-2.53.0l #name your branch according to your changes
12+
git checkout -b tmp-2.53.0o #name your branch according to your changes
1313
#git add ... git commit ... git push ... open pull request
1414

1515
For repository owners only:
1616

17-
git commit -m "Upgrade Firefox 46.0.1 & Ubuntu 20160503"
17+
git commit -m "Chrome 50.0.2661.102, mp4 html5 playback"
1818
git tag -d latest #tag latest will be updated from TravisCI
19-
git tag 2.53.0l && git push origin tmp-2.53.0l && git push --tags
19+
git tag 2.53.0o && git push origin tmp-2.53.0o && git push --tags
2020

2121
-- Wait for Travis to pass OK
2222
-- Make sure changes got merged into master by elgalubot
2323

24-
git checkout master && git pull && git branch -d tmp-2.53.0l && git push origin --delete tmp-2.53.0l
24+
git checkout master && git pull && git branch -d tmp-2.53.0o && git push origin --delete tmp-2.53.0o
2525

2626
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2727
-- Upgrade release tag in github.com with latest CHANGELOG.md
@@ -32,15 +32,15 @@ For repository owners only:
3232
### Chrome artifact
3333
Keep certain bins if chrome version changed for example:
3434

35-
VER="50.0.2661.94"
35+
VER="50.0.2661.102"
3636
wget -nv --show-progress -O binaries/google-chrome-stable_${VER}_amd64.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
3737

3838
## Retry
3939
Failed in Travis? retry
4040

41-
git tag -d 2.53.0l && git push origin :2.53.0l
41+
git tag -d 2.53.0o && git push origin :2.53.0o
4242
#git add ...
43-
git commit --amend && git tag 2.53.0l && git push --force origin tmp-2.53.0l && git push --tags
43+
git commit --amend && git tag 2.53.0o && git push --force origin tmp-2.53.0o && git push --tags
4444

4545
## Docker push from Travis CI
4646
Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ RUN apt-get update -qqy \
194194
/usr/lib/jvm/java-9-oracle/conf/security/java.security \
195195
&& rm -rf /var/lib/apt/lists/*
196196

197-
#=======
198-
# Fonts
199-
#=======
197+
#=========================
198+
# Fonts & video libraries
199+
#=========================
200200
RUN apt-get update -qqy \
201201
&& apt-get -qqy install \
202202
fonts-ipafont-gothic \
@@ -207,6 +207,7 @@ RUN apt-get update -qqy \
207207
ttf-ubuntu-font-family \
208208
libfreetype6 \
209209
libfontconfig \
210+
gstreamer1.0-libav \
210211
&& rm -rf /var/lib/apt/lists/*
211212

212213
#=========
@@ -764,7 +765,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
764765
# TODO: Use Google fingerprint to verify downloads
765766
# https://www.google.de/linuxrepositories/
766767
# Also fix .deb file names with correct version
767-
RUN latest_chrome_version_trigger="50.0.2661.94" \
768+
RUN latest_chrome_version_trigger="50.0.2661.102" \
768769
&& mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
769770
&& export CHROME_URL="https://dl.google.com/linux/direct" \
770771
&& wget -nv -O \

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
![docker-selenium-grid](./images/grid_console.png)
1818

19-
<h2 id="official">Notes on the official repo</h2>
19+
<h2 id="official">Official repo</h2>
2020

2121
Note [SeleniumHQ/docker-selenium](https://github.com/SeleniumHQ/docker-selenium) project is more useful for building selenium grids while this one focuses on building disposable standalone seleniums with [video recording support](./docs/videos.md) and both browsers on the same container. It also adds some other features like [customizing the screen size](#screen-size) and [ssh access](#ssh) that can be particularly useful for tunneling support.
2222

@@ -34,10 +34,10 @@ You can also configure [xvfb](https://docs.travis-ci.com/user/gui-and-headless-b
3434

3535
1. Pull the image and run the container
3636

37-
docker pull elgalu/selenium:2.53.0l
37+
docker pull elgalu/selenium:2.53.0o
3838

3939
docker run --rm -ti --name=grid -p 4444:24444 -p 5900:25900 \
40-
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0l
40+
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0o
4141

4242
2. Wait until the grid starts properly before starting the tests _(Optional but recommended)_
4343

@@ -62,7 +62,7 @@ This image is designed to run one test on each docker container but if you still
6262
docker run --rm -ti --name=grid -p 4444:24444 -p 5900:25900 \
6363
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
6464
-e MAX_INSTANCES=20 -e MAX_SESSIONS=20 \
65-
elgalu/selenium:2.53.0l
65+
elgalu/selenium:2.53.0o
6666

6767
The drawback is that all tests will run on the same desktop meaning the video recording will only capture the browser in the foreground but it's in the roadmap to make all this transparent, see issues [#78](https://github.com/elgalu/docker-selenium/issues/78) and [#77](https://github.com/elgalu/docker-selenium/issues/77).
6868

@@ -84,7 +84,7 @@ You can also ssh into the machine as long as `SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa
8484
docker run --rm -ti --name=grid -p=4444:24444 -p=5900:25900 -p=22222:22222 \
8585
-e SSHD=true \
8686
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
87-
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0l
87+
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0o
8888

8989
Then
9090

@@ -95,7 +95,7 @@ Include `-X` in ssh command if you want to redirect the started GUI programs to
9595
docker run --rm -ti --name=grid -p=4444:24444 -p=5900:25900 -p=22222:22222 \
9696
-e SSHD=true -e SSHD_X11FORWARDING=yes \
9797
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
98-
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0l
98+
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0o
9999

100100
Then
101101

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

116-
docker pull elgalu/selenium:2.53.0l
116+
docker pull elgalu/selenium:2.53.0o
117117

118118
docker run -d --name=grid -p 4444:24444 -p 5900:25900 \
119119
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
120120
-e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1480 \
121-
elgalu/selenium:2.53.0l
121+
elgalu/selenium:2.53.0o
122122

123123
docker exec grid wait_all_done 10s
124124

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

177177
docker run --rm -ti --name=grid -p 4444:24444 -p 5900:25900 \
178178
-v /dev/shm:/dev/shm -p 6080:26080 -e NOVNC=true \
179-
elgalu/selenium:2.53.0l
179+
elgalu/selenium:2.53.0o
180180

181181
If the VNC password was randomly generated find out with
182182

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

250250
You can simply verify that image id is indeed the correct one.
251251

252-
# e.g. full image id for tag 2.53.0l
252+
# e.g. full image id for tag 2.53.0o
253253
export IMGID="<<Please see CHANGELOG.md>>"
254-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0l |grep ${IMGID} &> /dev/null; then
254+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0o |grep ${IMGID} &> /dev/null; then
255255
echo "Image ID tested ok"
256256
else
257257
echo "Image ID doesn't match"
@@ -261,7 +261,7 @@ You can simply verify that image id is indeed the correct one.
261261

262262
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:
263263

264-
# e.g. sha256 for tag 2.53.0l
264+
# e.g. sha256 for tag 2.53.0o
265265
export SHA=<<Please see CHANGELOG.md>>
266266
docker pull elgalu/selenium@sha256:${SHA}
267267

@@ -293,7 +293,7 @@ Host machine, terminal 2:
293293
-v /dev/shm:/dev/shm \
294294
-e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
295295
-v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
296-
elgalu/selenium:2.53.0l
296+
elgalu/selenium:2.53.0o
297297

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

@@ -315,7 +315,7 @@ ANYPORT=0
315315
REMOTE_DOCKER_SRV=localhost
316316
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
317317
-p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
318-
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0l
318+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0o
319319
320320
# -- Option 2.docker run- Running docker on remote docker server like in the cloud
321321
# Useful if the docker server is running in the cloud. Establish free local ports
@@ -325,7 +325,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
325325
# it acts as a jump host so my public key is already on that server
326326
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
327327
-e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
328-
elgalu/selenium:2.53.0l
328+
elgalu/selenium:2.53.0o
329329
330330
# -- Common: Wait for the container to start
331331
./host-scripts/wait-docker-selenium.sh grid 7s
@@ -396,7 +396,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
396396
397397
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:
398398
399-
docker pull elgalu/selenium:2.53.0l
399+
docker pull elgalu/selenium:2.53.0o
400400
401401
### 2. Use this image
402402

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.53.0l
8+
docker pull elgalu/selenium:2.53.0o
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.53.0l
15+
-e VIDEO=true elgalu/selenium:2.53.0o
1616

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

test/script_push

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,6 @@ git_diff_add_commit() {
143143
# Git push changes, tag #
144144
#########################
145145
git_push_tag_push() {
146-
# other options:
147-
# git push github github/master:master
148-
# Failed push commands (i.e. do not use)
149-
# git push
150-
# git push github master
151-
# git push github github/master
152-
# git push -u github master
153146
if git push github HEAD:master >git_push_master.log 2>&1; then \
154147
failed=false; else failed=true; fi
155148
# hide secrets

0 commit comments

Comments
 (0)