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

Commit 50f7926

Browse files
committed
Upgrade Chrome patch 54.0.2840.100
1 parent 019af9f commit 50f7926

File tree

7 files changed

+41
-15
lines changed

7 files changed

+41
-15
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ matrix:
5959
- docker
6060
env:
6161
- DOCKER_VERSION="stable"
62-
DOCKER_COMPOSE_VERSION="1.9.0-rc3"
62+
DOCKER_COMPOSE_VERSION="1.9.0-rc4"
6363
# Linux with docker:beta/older compose:stable
6464
- os: linux
6565
language: c
@@ -69,7 +69,7 @@ matrix:
6969
- docker
7070
env:
7171
- DOCKER_VERSION="1.12.3-rc1"
72-
DOCKER_COMPOSE_VERSION="1.9.0-rc3"
72+
DOCKER_COMPOSE_VERSION="1.9.0-rc4"
7373
# Mac OSX: only test native docker version
7474
- os: osx
7575
osx_image: xcode8

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,33 @@ 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 54.0.2840.100
13+
+ Image tag details:
14+
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
15+
+ Selenium 3: 3.0.1 (1969d75)
16+
+ Chrome stable: TBD_CHROME_STABLE
17+
+ Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
18+
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
19+
+ Geckodriver: TBD_GECKO_DRIVER
20+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
21+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
22+
+ Timezone: TBD_TIME_ZONE
23+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
24+
+ Python: TBD_PYTHON_VERSION
25+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
26+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
27+
+ Tested on kernel dev host: 4.4.0-47-generic x86_64
28+
+ Tested on kernel CI host: TBD_HOST_UNAME
29+
+ Built at dev host with: Docker version 1.12.3, build 6b644ec
30+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
31+
+ Built at dev host with: Docker Compose version 1.8.1, build 878cff1
32+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
33+
+ Image size: TBD_IMAGE_SIZE
34+
+ Digest: TBD_DIGEST
35+
+ Image ID: TBD_IMAGE_ID
36+
1037
## 3.0.1d
1138
+ Date: 2016-11-07
1239
+ Reduce image size by 55%

CONTRIBUTING.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ For pull requests or local commits:
77
docker exec grid versions && ./test/after_script && travis lint
88
open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mkv
99
open test/seleIDE/videos/rc/sele_ide.mkv
10-
git checkout -b tmp-3.0.1d && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
10+
git checkout -b tmp-3.0.1e && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
1111
#git add ... git commit ... git push ... open pull request
1212

1313
For repository owners only:
1414

15-
git commit -m "Reduce image size by 55%"
16-
git tag -d latest && git tag 3.0.1d && git push origin tmp-3.0.1d && git push --tags
15+
git commit -m "Upgrade Chrome patch 54.0.2840.100"
16+
git tag -d latest && git tag 3.0.1e && git push origin tmp-3.0.1e && git push --tags
1717

1818
-- Wait for Travis to pass OK
1919
-- Make sure changes got merged into master by elgalubot
2020

21-
git checkout master && git pull && git branch -d tmp-3.0.1d && git push origin --delete tmp-3.0.1d
21+
git checkout master && git pull && git branch -d tmp-3.0.1e && git push origin --delete tmp-3.0.1e
2222

2323
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2424
-- If Chrome version changed upload:
@@ -28,17 +28,16 @@ For repository owners only:
2828
### Chrome artifact
2929
Keep certain bins if chrome version changed for example:
3030

31-
cd ~/tmp_binaries && VER="54.0.2840.90" && NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
31+
cd ~/tmp_binaries && VER="54.0.2840.100" && NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
3232
wget -nv --show-progress -O ${NAME}.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
33-
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha
34-
cp ${NAME}.md5 ${NAME}.sha ~/dosel/binaries
33+
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha && cp ${NAME}.md5 ${NAME}.sha ~/dosel/binaries
3534

3635
## Retry
3736
Failed in Travis? retry
3837

39-
git tag -d 3.0.1d && git push origin :3.0.1d
38+
git tag -d 3.0.1e && git push origin :3.0.1e
4039
#git add ...
41-
git commit --amend && git tag 3.0.1d && git push --force origin tmp-3.0.1d && git push --tags
40+
git commit --amend && git tag 3.0.1e && git push --force origin tmp-3.0.1e && git push --tags
4241

4342
## Docker push from Travis CI
4443
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ RUN wget --no-verbose -O geckodriver.tar.gz \
615615
#===============
616616
# TODO: Use Google fingerprint to verify downloads
617617
# https://www.google.de/linuxrepositories/
618-
ENV CHROME_VERSION_TRIGGER="54.0.2840.90" \
618+
ENV CHROME_VERSION_TRIGGER="54.0.2840.100" \
619619
CHROME_URL="https://dl.google.com/linux/direct" \
620620
CHROME_BASE_DEB_PATH="/home/seluser/chrome-deb/google-chrome" \
621621
GREP_ONLY_NUMS_VER="[0-9.]{2,20}"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* google-chrome-unstable: no longer provided but [can still be found here][2.47.1m]
1414
* firefox stable latest
1515
* firefox stable [last 18 versions can be found here][2.47.1m]
16-
* fluxbox or openbox (lightweight window managers)
16+
* fluxbox (openbox window manager can still be found [here](https://github.com/elgalu/docker-selenium/releases/tag/3.0.1c))
1717

1818
Selenium 2
1919
![docker-selenium-grid](./images/grid2_console.png)

TBD_DOCKER_TAG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
+ Python: TBD_PYTHON_VERSION
1616
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
1717
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
18-
+ Tested on kernel dev host: 4.4.0-45-generic x86_64
18+
+ Tested on kernel dev host: 4.4.0-47-generic x86_64
1919
+ Tested on kernel CI host: TBD_HOST_UNAME
2020
+ Built at dev host with: Docker version 1.12.3, build 6b644ec
2121
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

capabilities.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"caps": [
33
{
44
"BROWSER_NAME": "chrome",
5-
"VERSION": "54.0.2840.90",
5+
"VERSION": "54.0.2840.100",
66
"PLATFORM": "LINUX"
77
},
88
{

0 commit comments

Comments
 (0)