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

Commit 38121ac

Browse files
committed
Upgrade Chrome major to 50.0.2661.75 + chores
1 parent 89a75c4 commit 38121ac

21 files changed

+330
-101
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ install:
2929
# connect to selenium at http://172.17.0.4:24444/wd/hub
3030
# Unless, we use `--privileged` trick by Hiro Asari from Travis Corp.
3131
script:
32-
- ./test/script_scenario_1
32+
- travis_retry ./test/script_scenario_1
3333
- ./test/script_scenario_2
3434
- ./test/script_archive
3535
- ./test/script_push

CHANGELOG.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ 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 major to TBD_CHROME_STABLE
13+
+ Chore: modularize script_push a bit
14+
+ Chore: Update more changelog versions from Travis
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.2.0-35-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.0g
1135
+ Date: 2016-04-12
1236
+ Upgrade Firefox to 45.0.2
1337
+ Upgrade BrowserStack local to 5.3
14-
+ Updates
1538
+ Image tag details:
1639
+ Selenium: v2.53.0 (35ae25b)
1740
+ Chrome stable: 49.0.2623.112

CONTRIBUTING.md

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
# Contributing
22

33
## Local
4-
./test/before_install_build && ./test/install
5-
./test/script_scenario_1 && ./test/script_scenario_2
6-
./test/script_archive && ./test/script_push && ./test/after_script
4+
./test/before_install_build && ./test/install && ./test/script_scenario_1
5+
./test/script_scenario_2 && ./test/script_archive && ./test/script_push && ./test/after_script
76
open ./images/grid_console.png
8-
open ./videos/chrome/test.mkv
7+
git checkout ./images/grid_console.png && open ./videos/chrome/test.mkv
98
travis lint
10-
git checkout -b tmp-2.53.0g
9+
git checkout -b tmp-2.53.0h
1110
#git add ...
12-
git commit -m "Upgrade Firefox 45.0.2 & BrowserStack 5.3"
13-
git tag 2.53.0g && git push origin tmp-2.53.0g && git push --tags
14-
#if Travis passes OK and changes got merged into master by elgalubot
15-
git checkout master && git branch -d tmp-2.53.0g && git push origin --delete tmp-2.53.0g
11+
git commit -m "Upgrade Chrome major to 50.0.2661.75 + chores"
12+
git tag 2.53.0h && git push origin tmp-2.53.0h && git push --tags
13+
14+
If Travis passes OK and changes got merged into master by elgalubot
15+
16+
git checkout master && git pull && git branch -d tmp-2.53.0h && git push origin --delete tmp-2.53.0h
17+
18+
Upgrade release tag in github.com with latest CHANGELOG.md
19+
If Chrome version changed upload:
20+
21+
~/docker/binaries/
22+
23+
### Chrome artifact
24+
Keep certain bins if chrome version changed for example:
25+
26+
VER="50.0.2661.75"
27+
wget -nv --show-progress -O binaries/google-chrome-stable_${VER}_amd64.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
1628

1729
## Retry
1830
Failed in Travis? retry
1931

20-
git tag -d 2.53.0g && git push origin :2.53.0g
32+
git tag -d 2.53.0h && git push origin :2.53.0h
2133
#git add ...
22-
git commit --amend
23-
git tag 2.53.0g && git push --force origin tmp-2.53.0g && git push --tags
34+
git commit --amend && git tag 2.53.0h && git push --force origin tmp-2.53.0h && git push --tags
2435

2536
## Docker push from Travis CI
2637
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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
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
FROM ubuntu:xenial-20160331.1
7-
ENV UBUNTU_FLAVOR xenial
7+
ENV UBUNTU_FLAVOR="xenial" \
8+
UBUNTU_DATE="20160331.1"
89

910
#== Ubuntu wily is 15.10, i.e. FROM ubuntu:15.10
1011
# FROM ubuntu:wily-20151208
@@ -92,10 +93,11 @@ RUN locale-gen ${LANGUAGE} \
9293
#===================
9394
# Full list at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
9495
# e.g. "US/Pacific" for Los Angeles, California, USA
95-
# ENV TZ "US/Pacific"
96+
# e.g. ENV TZ "US/Pacific"
9697
ENV TZ "Europe/Berlin"
9798
# Apply TimeZone
98-
RUN echo $TZ | tee /etc/timezone \
99+
RUN echo "Setting time zone to '${TZ}'" \
100+
&& echo ${TZ} > /etc/timezone \
99101
&& dpkg-reconfigure --frontend noninteractive tzdata
100102

101103
#==============================
@@ -761,7 +763,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
761763
# TODO: Use Google fingerprint to verify downloads
762764
# https://www.google.de/linuxrepositories/
763765
# Also fix .deb file names with correct version
764-
RUN latest_chrome_version_trigger="49.0.2623.110" \
766+
RUN latest_chrome_version_trigger="50.0.2661.75" \
765767
&& mkdir -p ${NORMAL_USER_HOME}/chrome-deb \
766768
&& export CHROME_URL="https://dl.google.com/linux/direct" \
767769
&& wget -nv -O \

README.md

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

2424
1. Pull the image and run the container
2525

26-
docker pull elgalu/selenium:2.53.0g
26+
docker pull elgalu/selenium:2.53.0h
2727

2828
docker run --rm -ti --name=grid -p 4444:24444 -p 5920:25900 \
29-
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0g
29+
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:2.53.0h
3030

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

@@ -61,7 +61,7 @@ You can also ssh into the machine as long as `SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa
6161
docker run --rm -ti --name=grid -p=4444:24444 -p=5920:25900 -p=22222:22222 \
6262
-e SSHD=true \
6363
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
64-
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0g
64+
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0h
6565

6666
Then
6767

@@ -72,7 +72,7 @@ Include `-X` in ssh command if you want to redirect the started GUI programs to
7272
docker run --rm -ti --name=grid -p=4444:24444 -p=5920:25900 -p=22222:22222 \
7373
-e SSHD=true -e SSHD_X11FORWARDING=yes \
7474
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" \
75-
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0g
75+
-v /dev/shm:/dev/shm elgalu/selenium:2.53.0h
7676

7777
Then
7878

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

93-
docker pull elgalu/selenium:2.53.0g
93+
docker pull elgalu/selenium:2.53.0h
9494

9595
docker run -d --name=grid -p 4444:24444 -p 5920:25900 \
9696
-v /dev/shm:/dev/shm -e VNC_PASSWORD=hola \
9797
-e SCREEN_WIDTH=1920 -e SCREEN_HEIGHT=1480 \
98-
elgalu/selenium:2.53.0g
98+
elgalu/selenium:2.53.0h
9999

100100
docker exec grid wait_all_done 10s
101101

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

153153
docker run --rm -ti --name=grid -p 4444:24444 -p 5920:25900 \
154154
-v /dev/shm:/dev/shm -p 6080:26080 -e NOVNC=true \
155-
elgalu/selenium:2.53.0g
155+
elgalu/selenium:2.53.0h
156156

157157
If the VNC password was randomly generated find out with
158158

@@ -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.53.0g
226+
# e.g. full image id for tag 2.53.0h
227227
export IMGID="<<Please see CHANGELOG.md>>"
228-
if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0g |grep ${IMGID} &> /dev/null; then
228+
if docker inspect -f='{{.Id}}' elgalu/selenium:2.53.0h |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.53.0g
238+
# e.g. sha256 for tag 2.53.0h
239239
export SHA=<<Please see CHANGELOG.md>>
240240
docker pull elgalu/selenium@sha256:${SHA}
241241

@@ -267,7 +267,7 @@ Host machine, terminal 2:
267267
-v /dev/shm:/dev/shm \
268268
-e SCREEN_WIDTH -e SCREEN_HEIGHT -e XE_DISP_NUM \
269269
-v /tmp/.X11-unix/X${XE_DISP_NUM}:/tmp/.X11-unix/X${XE_DISP_NUM} \
270-
elgalu/selenium:2.53.0g
270+
elgalu/selenium:2.53.0h
271271

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

@@ -289,7 +289,7 @@ ANYPORT=0
289289
REMOTE_DOCKER_SRV=localhost
290290
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -p=0.0.0.0:${ANYPORT}:24444 \
291291
-p=0.0.0.0:${ANYPORT}:25900 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola \
292-
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0g
292+
-e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:2.53.0h
293293
294294
# -- Option 2.docker run- Running docker on remote docker server like in the cloud
295295
# Useful if the docker server is running in the cloud. Establish free local ports
@@ -299,7 +299,7 @@ ssh ${REMOTE_DOCKER_SRV} #get into the remote docker provider somehow
299299
# it acts as a jump host so my public key is already on that server
300300
CONTAINER=$(docker run -d -p=0.0.0.0:${ANYPORT}:22222 -e SCREEN_HEIGHT=1110 \
301301
-e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/authorized_keys)" \
302-
elgalu/selenium:2.53.0g
302+
elgalu/selenium:2.53.0h
303303
304304
# -- Common: Wait for the container to start
305305
./host-scripts/wait-docker-selenium.sh grid 7s
@@ -370,7 +370,7 @@ If you git clone this repo locally, i.e. cd into where the Dockerfile is, you ca
370370
371371
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:
372372
373-
docker pull elgalu/selenium:2.53.0g
373+
docker pull elgalu/selenium:2.53.0h
374374
375375
### 2. Use this image
376376

0 commit comments

Comments
 (0)