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

Commit 9337a8f

Browse files
committed
Upgrade Chrome major to 62.0.3202.62
1 parent 93015a3 commit 9337a8f

File tree

10 files changed

+67
-16
lines changed

10 files changed

+67
-16
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
- stage: Docker build (re-use in stages)
3535
env: step=build_push
3636
script:
37+
- travis_retry ./test/before_install_setup
3738
- travis_retry ./test/before_install_build
3839

3940
- stage: Integration and Unit Tests

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,31 @@ 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+
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/3.6.0-p3...3.6.0-p4 (TBD_DATE)
12+
+ Upgrade Chrome major to 62.0.3202.62
13+
+ Upgrade ubuntu:xenial-20171006
14+
+ Start using the Dockerfile ARG instruction
15+
+ **Image tag details:**
16+
+ Selenium version: TBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
17+
+ Chrome stable: TBD_CHROME_STABLE
18+
+ Firefox stable: TBD_FIREFOX_VERSION
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-96-generic x86_64
26+
+ Tested on kernel CI host: TBD_HOST_UNAME
27+
+ Built at dev host with: Docker version 17.10.0-ce, build f4ffd25
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.17.0-rc1, build a0f95af
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.6.0-p3
1136
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/3.6.0-p2...3.6.0-p3 (2017-10-10)
1237
+ Upgrade Firefox patch to 56.0.1

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
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 Firefox patch to 56.0.1"
14+
git commit -m "Upgrade Chrome major to 62.0.3202.62"
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

Dockerfile

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
1+
#== FROM instructions support variables that are declared by
2+
# any ARG instructions that occur before the first FROM
3+
# ref: https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
4+
#
5+
# To overwrite the build args use:
6+
# docker build ... --build-arg UBUNTU_DATE=20171006
7+
ARG UBUNTU_FLAVOR=xenial
8+
ARG UBUNTU_DATE=20171006
9+
110
#== Ubuntu xenial is 16.04, i.e. FROM ubuntu:16.04
211
# Find latest images at https://hub.docker.com/r/library/ubuntu/
3-
# Layer size: big: 127.2 MB
4-
FROM ubuntu:xenial-20170915
5-
ENV UBUNTU_FLAVOR="xenial" \
6-
UBUNTU_DATE="20170915"
12+
# Layer size: ~122 MB
13+
FROM ubuntu:${UBUNTU_FLAVOR}-${UBUNTU_DATE}
14+
15+
#== An ARG declared before a FROM is outside of a build stage,
16+
# so it can’t be used in any instruction after a FROM. To use
17+
# the default value of an ARG declared before the first
18+
# FROM use an ARG instruction without a value inside of a build stage
19+
# ref: https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
20+
ARG UBUNTU_FLAVOR
21+
ARG UBUNTU_DATE
22+
23+
# Docker build debug logging, green colored
24+
RUN printf "\033[1;32mFROM ubuntu:${UBUNTU_FLAVOR}-${UBUNTU_DATE} \033[0m\n"
725

826
#== Ubuntu flavors - common
927
RUN echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR} main universe\n" > /etc/apt/sources.list \
1028
&& echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR}-updates main universe\n" >> /etc/apt/sources.list \
1129
&& echo "deb http://archive.ubuntu.com/ubuntu ${UBUNTU_FLAVOR}-security main universe\n" >> /etc/apt/sources.list
1230

13-
MAINTAINER Team TIP <elgalu3+team-tip@gmail.com>
31+
MAINTAINER Leo Gallucci <elgalu3+dosel@gmail.com>
1432
# https://github.com/docker/docker/pull/25466#discussion-diff-74622923R677
15-
LABEL maintainer "Team TIP <elgalu3+team-tip@gmail.com>"
33+
LABEL maintainer "Leo Gallucci <elgalu3+dosel@gmail.com>"
1634

1735
# No interactive frontend during docker build
1836
ENV DEBIAN_FRONTEND=noninteractive \
@@ -23,6 +41,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
2341
# ref: https://github.com/nodejs/docker-node/issues/340#issuecomment-321669029
2442
# ref: http://askubuntu.com/a/235911/134645
2543
# ref: https://github.com/moby/moby/issues/20022#issuecomment-182169732
44+
# How to remove keys? e.g. sudo apt-key del 2EA8F35793D8809A
2645
RUN set -ex \
2746
&& for key in \
2847
2EA8F35793D8809A \
@@ -36,7 +55,6 @@ RUN set -ex \
3655
gpg --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
3756
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
3857
done
39-
# How to remove keys? e.g. sudo apt-key del 2EA8F35793D8809A
4058

4159
#========================
4260
# Miscellaneous packages
@@ -236,12 +254,18 @@ RUN apt-get -qqy update \
236254
USER seluser
237255
WORKDIR /home/seluser
238256

257+
# Docker backward compatibility
258+
RUN echo "${UBUNTU_FLAVOR}" > UBUNTU_FLAVOR \
259+
&& echo "${UBUNTU_DATE}" > UBUNTU_DATE
260+
239261
#=================
240262
# Selenium latest
241263
#=================
242264
# Layer size: medium ~22 MB
243265
ENV SEL_DIRECTORY="3.6" \
244266
SEL_VER="3.6.0"
267+
268+
RUN echo $SEL_VER
245269
RUN export SELBASE="https://selenium-release.storage.googleapis.com" \
246270
&& export SELPATH="${SEL_DIRECTORY}/selenium-server-standalone-${SEL_VER}.jar" \
247271
&& wget -nv ${SELBASE}/${SELPATH} \
@@ -603,12 +627,12 @@ RUN wget --no-verbose -O geckodriver.tar.gz \
603627
#===============
604628
# TODO: Use Google fingerprint to verify downloads
605629
# https://www.google.de/linuxrepositories/
606-
ENV CHROME_VERSION_TRIGGER="61.0.3163.100" \
630+
ENV CHROME_VERSION_TRIGGER="62.0.3202.62" \
607631
CHROME_URL="https://dl.google.com/linux/direct" \
608632
CHROME_BASE_DEB_PATH="/home/seluser/chrome-deb/google-chrome" \
609633
GREP_ONLY_NUMS_VER="[0-9.]{2,20}"
610634

611-
LABEL selenium_chrome_version "61.0.3163.100"
635+
LABEL selenium_chrome_version "62.0.3202.62"
612636

613637
# Layer size: huge: 196.3 MB
614638
RUN apt-get -qqy update \

TBD_DOCKER_TAG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
+ Python: TBD_PYTHON_VERSION
1414
+ Tested on kernel dev host: 4.4.0-96-generic x86_64
1515
+ Tested on kernel CI host: TBD_HOST_UNAME
16-
+ Built at dev host with: Docker version 17.07.0-ce, build 8784753
16+
+ Built at dev host with: Docker version 17.10.0-ce, build f4ffd25
1717
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
18-
+ Built at dev host with: Docker Compose version 1.16.1, build 6d1ac21
18+
+ Built at dev host with: Docker Compose version 1.17.0-rc1, build a0f95af
1919
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
2020
+ Image size: TBD_IMAGE_SIZE
2121
+ Digest: TBD_DIGEST

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.0-p3
1+
3.6.0-p4

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

images/grid3_console.png

-60 Bytes
Loading

test/before_install_pull

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ if [[ ${TRAVIS_PULL_REQUEST_SLUG} != "" && \
2323
${TRAVIS_PULL_REQUEST_SLUG} != ${TRAVIS_REPO_SLUG} && \
2424
${TRAVIS_PULL_REQUEST} != "false" ]]; then
2525
echo "WARN: External PRs are untrusted by default therefore we need can't reuse and pull the image so building it from scratch..."
26+
./test/before_install_setup
2627
./host-scripts/gen-scm-source.sh
2728
docker build -t selenium .
2829
else

test/script_push

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ update_changelog() {
148148
|| die "while trying to get TBD_JAVA_VENDOR"
149149
TBD_TIME_ZONE="$(docker exec grid printenv TZ | sed -r 's/[\/]+/\\\//g')" \
150150
|| die "while trying to get TBD_TIME_ZONE"
151-
UBUNTU_FLAVOR=$(docker exec grid printenv UBUNTU_FLAVOR) \
151+
UBUNTU_FLAVOR=$(docker exec grid cat UBUNTU_FLAVOR) \
152152
|| die "while trying to get UBUNTU_FLAVOR"
153-
UBUNTU_DATE=$(docker exec grid printenv UBUNTU_DATE) \
153+
UBUNTU_DATE=$(docker exec grid cat UBUNTU_DATE) \
154154
|| die "while trying to get UBUNTU_DATE"
155155
sed -i -- "s/TBD_DOCKER_TAG/${TBD_DOCKER_TAG}/g" CHANGELOG.md || true
156156
sed -i -- "s/TBD_DIGEST/${TBD_DIGEST}/g" CHANGELOG.md || true

0 commit comments

Comments
 (0)