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

Commit b909dc2

Browse files
committed
Upgrade Chrome patch to 56.0.2924.87
1 parent acf4e49 commit b909dc2

File tree

9 files changed

+38
-13
lines changed

9 files changed

+38
-13
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ matrix:
3737
- docker
3838
env:
3939
- DOCKER_VERSION="stable"
40-
DOCKER_COMPOSE_VERSION="1.10.0"
40+
DOCKER_COMPOSE_VERSION="1.10.1"
4141
DOCKER_PUSH=true
4242
DOCKER_PUSH_LATEST=true
4343
# Linux with docker:beta/older compose:beta/older
@@ -49,7 +49,7 @@ matrix:
4949
- docker
5050
env:
5151
- DOCKER_VERSION="1.13.1-rc1"
52-
DOCKER_COMPOSE_VERSION="1.10.0"
52+
DOCKER_COMPOSE_VERSION="1.10.1"
5353
# Linux with docker:stable compose:beta/older
5454
- os: linux
5555
language: c

CHANGELOG.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,37 @@ 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 56.0.2924.87
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+
+ Tested on kernel dev host: 4.4.0-59-generic x86_64
26+
+ Tested on kernel CI host: TBD_HOST_UNAME
27+
+ Built at dev host with: Docker version 1.13.0, build 49bf474
28+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
29+
+ Built at dev host with: Docker Compose version 1.10.1, build b252738
30+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
31+
+ Image size: TBD_IMAGE_SIZE
32+
+ Digest: TBD_DIGEST
33+
+ Image ID: TBD_IMAGE_ID
34+
1035
## 3.0.1-p7
1136
+ Date: 2017-02-01
1237
+ Upgrade Firefox (for selenium 3) from 51.0 to 51.0.1
1338
+ Upgrade Geckodriver minor from 0.13.0 to 0.14.0
1439
+ Fix docker-compose issue closes #141
15-
+ Remove Selenium RC from tests are the feature is not being used
40+
+ Remove Selenium RC from tests as the feature is not being used
1641
+ Image tag details:
1742
+ Selenium 2: 2.53.1 (a36b8b1)
1843
+ Selenium 3: 3.0.1 (1969d75)

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For pull requests or local commits:
1212

1313
For repository owners only:
1414

15-
git commit -m "Fix docker-compose issue closes #141"
15+
git commit -m "Upgrade Chrome patch to 56.0.2924.87"
1616
git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
1717

1818
-- Wait for Travis to pass OK
@@ -28,7 +28,7 @@ For repository owners only:
2828
### Chrome artifact
2929
Keep certain bins if chrome version changed for example:
3030

31-
cd ~/tmp_binaries && VER="56.0.2924.76" && NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
31+
cd ~/tmp_binaries && VER="56.0.2924.87" && 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"
3333
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha && cp ${NAME}.md5 ${NAME}.sha ~/dosel/binaries
3434

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,13 +571,13 @@ RUN wget --no-verbose -O geckodriver.tar.gz \
571571
#===============
572572
# TODO: Use Google fingerprint to verify downloads
573573
# https://www.google.de/linuxrepositories/
574-
ENV CHROME_VERSION_TRIGGER="56.0.2924.76" \
574+
ENV CHROME_VERSION_TRIGGER="56.0.2924.87" \
575575
CHROME_URL="https://dl.google.com/linux/direct" \
576576
CHROME_BASE_DEB_PATH="/home/seluser/chrome-deb/google-chrome" \
577577
GREP_ONLY_NUMS_VER="[0-9.]{2,20}"
578578

579-
LABEL selenium2_chrome_version "56.0.2924.76"
580-
LABEL selenium3_chrome_version "56.0.2924.76"
579+
LABEL selenium2_chrome_version "56.0.2924.87"
580+
LABEL selenium3_chrome_version "56.0.2924.87"
581581

582582
# Layer size: huge: 196.3 MB
583583
RUN apt-get -qqy update \

TBD_DOCKER_TAG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
+ Tested on kernel CI host: TBD_HOST_UNAME
1818
+ Built at dev host with: Docker version 1.13.0, build 49bf474
1919
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
20-
+ Built at dev host with: Docker Compose version 1.10.0, build 4bd6f1a
20+
+ Built at dev host with: Docker Compose version 1.10.1, build b252738
2121
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
2222
+ Image size: TBD_IMAGE_SIZE
2323
+ Digest: TBD_DIGEST

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1-p7
1+
3.0.1-p8

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": "56.0.2924.76",
5+
"VERSION": "56.0.2924.87",
66
"PLATFORM": "LINUX"
77
},
88
{

capabilities2.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": "56.0.2924.76",
5+
"VERSION": "56.0.2924.87",
66
"PLATFORM": "LINUX"
77
},
88
{

capabilities3.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": "56.0.2924.76",
5+
"VERSION": "56.0.2924.87",
66
"PLATFORM": "LINUX"
77
},
88
{

0 commit comments

Comments
 (0)