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

Commit a630af4

Browse files
committed
Upgrade Chrome patch to 62.0.3202.75
1 parent 147272f commit a630af4

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

CONTRIBUTING.md

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

1212
For repository owners only:
1313

14-
git commit -m "Upgrade Chrome major to 62.0.3202.62"
14+
git commit -m "Upgrade Chrome patch to 62.0.3202.75"
1515
git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
1616

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

30-
cd ~/tmp_binaries && VER="61.0.3163.100" && NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
30+
cd ~/tmp_binaries && VER="62.0.3202.75" && NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
3131
wget -nv --show-progress -O ${NAME}.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
3232
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha && cp ${NAME}.md5 ${NAME}.sha ~/dosel/binaries
3333

Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,17 +622,18 @@ RUN wget --no-verbose -O geckodriver.tar.gz \
622622
&& chown seluser:seluser /usr/bin/geckodriver \
623623
&& rm geckodriver.tar.gz
624624

625+
COPY bin/fail /usr/bin/
625626
#===============
626627
# Google Chrome
627628
#===============
628629
# TODO: Use Google fingerprint to verify downloads
629630
# https://www.google.de/linuxrepositories/
630-
ENV CHROME_VERSION_TRIGGER="62.0.3202.62" \
631-
CHROME_URL="https://dl.google.com/linux/direct" \
631+
ARG EXPECTED_CHROME_VERSION="62.0.3202.75"
632+
ENV CHROME_URL="https://dl.google.com/linux/direct" \
632633
CHROME_BASE_DEB_PATH="/home/seluser/chrome-deb/google-chrome" \
633634
GREP_ONLY_NUMS_VER="[0-9.]{2,20}"
634635

635-
LABEL selenium_chrome_version "62.0.3202.62"
636+
LABEL selenium_chrome_version "${EXPECTED_CHROME_VERSION}"
636637

637638
# Layer size: huge: 196.3 MB
638639
RUN apt-get -qqy update \
@@ -647,7 +648,8 @@ RUN apt-get -qqy update \
647648
&& rm -rf /var/lib/apt/lists/* \
648649
&& apt-get -qyy clean \
649650
&& export CH_STABLE_VER=$(/usr/bin/google-chrome-stable --version | grep -iEo "${GREP_ONLY_NUMS_VER}") \
650-
&& echo "${CH_STABLE_VER}"
651+
&& echo "CH_STABLE_VER:'${CH_STABLE_VER}' vs EXPECTED_CHROME_VERSION:'${EXPECTED_CHROME_VERSION}'" \
652+
&& [ "${CH_STABLE_VER}" = "${EXPECTED_CHROME_VERSION}" ] || fail
651653
# We have a wrapper for /opt/google/chrome/google-chrome
652654
RUN mv /opt/google/chrome/google-chrome /opt/google/chrome/google-chrome-base
653655
COPY selenium-node-chrome/opt /opt

bin/fail

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
# Prints debug info with precise time
4+
echo "--${SELENIUM_FIRST_NODE_PORT}ERROR $(date "+%H:%M:%S:%N") $@" >&2
5+
exit 101

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

0 commit comments

Comments
 (0)