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

Commit e4daa4b

Browse files
committed
Upgrade Chromedriver from 2.23 to 2.24
1 parent 27c9444 commit e4daa4b

File tree

5 files changed

+68
-44
lines changed

5 files changed

+68
-44
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,30 @@ 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 Chromedriver from 2.23 to 2.24
13+
+ Image tag details:
14+
+ Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
15+
+ Chrome stable: TBD_CHROME_STABLE
16+
+ Firefox stable: TBD_FIREFOX_STABLE
17+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
18+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
19+
+ Timezone: TBD_TIME_ZONE
20+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
21+
+ Python: TBD_PYTHON_VERSION
22+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
23+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
24+
+ Tested on kernel dev host: 4.4.0-38-generic x86_64
25+
+ Tested on kernel CI host: TBD_HOST_UNAME
26+
+ Built at dev host with: Docker version 1.12.1, build 23cf638
27+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
28+
+ Built at dev host with: Docker Compose version 1.8.0, build f3628c7
29+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
30+
+ Image size: TBD_IMAGE_SIZE
31+
+ Digest: TBD_DIGEST
32+
+ Image ID: TBD_IMAGE_ID
33+
1034
## 2.53.1u
1135
+ Date: 2016-09-08
1236
+ Upgrade Chrome patch to 53.0.2785.101

CONTRIBUTING.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@
44
For pull requests or local commits:
55

66
time (./test/bef && ./test/install && ./test/script_start && ./test/script_end) ; beep
7-
docker exec grid versions && ./test/after_script
8-
open ./images/grid_console.png #to verify the versions are correct
9-
git checkout ./images/grid_console.png && open ./videos/chrome/*.mkv
10-
travis lint #if you changed .travis.yml
11-
git checkout -b tmp-2.53.1u #name your branch according to your changes
7+
docker exec grid versions && ./test/after_script && travis lint
8+
open ./images/grid_console.png && open ./videos/chrome/*.mkv
9+
git checkout -b tmp-2.53.1v && git checkout ./images/grid_console.png
1210
#git add ... git commit ... git push ... open pull request
1311

1412
For repository owners only:
1513

16-
git commit -m "Upgrade Chrome patch to 53.0.2785.101"
17-
git tag -d latest && git tag 2.53.1u && git push origin tmp-2.53.1u && git push --tags
14+
git commit -m "Upgrade Chromedriver from 2.23 to 2.24"
15+
git tag -d latest && git tag 2.53.1v && git push origin tmp-2.53.1v && git push --tags
1816

1917
-- Wait for Travis to pass OK
2018
-- Make sure changes got merged into master by elgalubot
2119

22-
git checkout master && git pull && git branch -d tmp-2.53.1u && git push origin --delete tmp-2.53.1u
20+
git checkout master && git pull && git branch -d tmp-2.53.1v && git push origin --delete tmp-2.53.1v
2321

2422
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2523
-- If Chrome version changed upload:
@@ -29,20 +27,17 @@ For repository owners only:
2927
### Chrome artifact
3028
Keep certain bins if chrome version changed for example:
3129

32-
cd binaries && wget -O stable_updates.html "http://googlechromereleases.blogspot.de/search/label/Stable%20updates"
33-
VER=$(grep -Po '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' stable_updates.html | head -1)
34-
echo $VER; VER="53.0.2785.101"
30+
cd binaries && VER="53.0.2785.101"
3531
NAME="google-chrome-stable_${VER}_amd64" && echo ${NAME}
3632
wget -nv --show-progress -O ${NAME}.deb "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
3733
md5sum ${NAME}.deb > ${NAME}.md5 && shasum ${NAME}.deb > ${NAME}.sha
38-
rm -f stable_updates.html && cd ..
3934

4035
## Retry
4136
Failed in Travis? retry
4237

43-
git tag -d 2.53.1u && git push origin :2.53.1u
38+
git tag -d 2.53.1v && git push origin :2.53.1v
4439
#git add ...
45-
git commit --amend && git tag 2.53.1u && git push --force origin tmp-2.53.1u && git push --tags
40+
git commit --amend && git tag 2.53.1v && git push --force origin tmp-2.53.1v && git push --tags
4641

4742
## Docker push from Travis CI
4843
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: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 \
6262
# ts from moreutils will prepend a timestamp to every line of input you give it
6363
# grc is a terminal colorizer that works nice with tail https://github.com/garabik/grc
6464
# dbus-x11 is needed to avoid http://askubuntu.com/q/237893/134645
65-
RUN apt-get update -qqy \
65+
RUN apt-get -qqy update \
6666
&& apt-get -qqy install \
6767
apt-utils \
6868
sudo \
@@ -94,7 +94,7 @@ ENV LANGUAGE ${LANG_WHICH}_${LANG_WHERE}.${ENCODING}
9494
ENV LANG ${LANGUAGE}
9595
RUN locale-gen ${LANGUAGE} \
9696
&& dpkg-reconfigure --frontend noninteractive locales \
97-
&& apt-get update -qqy \
97+
&& apt-get -qqy update \
9898
&& apt-get -qqy install \
9999
language-pack-en \
100100
&& rm -rf /var/lib/apt/lists/*
@@ -118,7 +118,7 @@ RUN echo "Setting time zone to '${TZ}'" \
118118
# Regarding urandom see
119119
# http://stackoverflow.com/q/26021181/511069
120120
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
121-
# RUN apt-get update -qqy \
121+
# RUN apt-get -qqy update \
122122
# && apt-get -qqy install \
123123
# openjdk-7-jre-headless \
124124
# && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
@@ -134,7 +134,7 @@ RUN echo "Setting time zone to '${TZ}'" \
134134
# Regarding urandom see
135135
# http://stackoverflow.com/q/26021181/511069
136136
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
137-
# RUN apt-get update -qqy \
137+
# RUN apt-get -qqy update \
138138
# && apt-get -qqy install \
139139
# openjdk-8-jre-headless \
140140
# && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
@@ -150,7 +150,7 @@ RUN echo "Setting time zone to '${TZ}'" \
150150
# Regarding urandom see
151151
# http://stackoverflow.com/q/26021181/511069
152152
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
153-
# RUN apt-get update -qqy \
153+
# RUN apt-get -qqy update \
154154
# && apt-get -qqy install \
155155
# openjdk-9-jre-headless \
156156
# && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
@@ -165,15 +165,15 @@ RUN echo "Setting time zone to '${TZ}'" \
165165
# Regarding urandom see
166166
# http://stackoverflow.com/q/26021181/511069
167167
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
168-
# RUN apt-get update -qqy \
168+
# RUN apt-get -qqy update \
169169
# && apt-get -qqy install \
170170
# software-properties-common \
171171
# && echo debconf shared/accepted-oracle-license-v1-1 \
172172
# select true | debconf-set-selections \
173173
# && echo debconf shared/accepted-oracle-license-v1-1 \
174174
# seen true | debconf-set-selections \
175175
# && add-apt-repository ppa:webupd8team/java \
176-
# && apt-get update -qqy \
176+
# && apt-get -qqy update \
177177
# && apt-get -qqy install \
178178
# oracle-java8-installer \
179179
# && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
@@ -188,15 +188,15 @@ RUN echo "Setting time zone to '${TZ}'" \
188188
# Regarding urandom see
189189
# http://stackoverflow.com/q/26021181/511069
190190
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
191-
RUN apt-get update -qqy \
191+
RUN apt-get -qqy update \
192192
&& apt-get -qqy install \
193193
software-properties-common \
194194
&& echo debconf shared/accepted-oracle-license-v1-1 \
195195
select true | debconf-set-selections \
196196
&& echo debconf shared/accepted-oracle-license-v1-1 \
197197
seen true | debconf-set-selections \
198198
&& add-apt-repository ppa:webupd8team/java \
199-
&& apt-get update -qqy \
199+
&& apt-get -qqy update \
200200
&& apt-get -qqy install \
201201
oracle-java9-installer \
202202
&& sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
@@ -209,7 +209,7 @@ RUN apt-get update -qqy \
209209
# Fonts & video libraries
210210
#=========================
211211
# and gstreamer for mp4 & html5 support
212-
RUN apt-get update -qqy \
212+
RUN apt-get -qqy update \
213213
&& apt-get -qqy install \
214214
fonts-ipafont-gothic \
215215
xfonts-100dpi \
@@ -226,7 +226,7 @@ RUN apt-get update -qqy \
226226
# Openbox
227227
# A lightweight window manager using freedesktop standards
228228
#=========
229-
RUN apt-get update -qqy \
229+
RUN apt-get -qqy update \
230230
&& apt-get -qqy install \
231231
openbox obconf menu \
232232
&& rm -rf /var/lib/apt/lists/*
@@ -235,7 +235,7 @@ RUN apt-get update -qqy \
235235
# fluxbox
236236
# A fast, lightweight and responsive window manager
237237
#=========
238-
RUN apt-get update -qqy \
238+
RUN apt-get -qqy update \
239239
&& apt-get -qqy install \
240240
fluxbox \
241241
&& rm -rf /var/lib/apt/lists/*
@@ -271,7 +271,7 @@ ENV NORMAL_USER_HOME /home/${NORMAL_USER}
271271
# libnss3-1d \
272272
# RUN wget -nv -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
273273
# && echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
274-
# && apt-get update -qqy \
274+
# && apt-get -qqy update \
275275
# && apt-get -qqy install \
276276
# google-chrome-${CHROME_FLAVOR} \
277277
# && rm -rf /var/lib/apt/lists/* \
@@ -291,7 +291,7 @@ ENV NORMAL_USER_HOME /home/${NORMAL_USER}
291291
# Pyvnc2swf: Is a cross-platform screen recording tool (vnc2swf command)
292292
# - captures screen motion through VNC protocol
293293
# - generates a Shockwave Flash (SWF) movie
294-
RUN apt-get update -qqy \
294+
RUN apt-get -qqy update \
295295
&& apt-get -qqy install \
296296
x11vnc \
297297
pyvnc2swf \
@@ -307,7 +307,7 @@ ENV RUN_DIR /var/run/sele
307307
#======================
308308
# http://linux.die.net/man/5/sshd_config
309309
# http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man5/sshd_config.5
310-
RUN apt-get update -qqy \
310+
RUN apt-get -qqy update \
311311
&& apt-get -qqy install \
312312
openssh-server \
313313
&& echo "PidFile ${RUN_DIR}/sshd.pid" >> /etc/ssh/sshd_config \
@@ -351,7 +351,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
351351
#===============================
352352
# ffmpeg (ffmpeg): Is a better alternative to Pyvnc2swf
353353
# (use in Ubuntu >= 15) packages: ffmpeg
354-
# RUN apt-get update -qqy \
354+
# RUN apt-get -qqy update \
355355
# && apt-get -qqy install \
356356
# libx264-dev \
357357
# libvorbis-dev \
@@ -364,7 +364,7 @@ RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
364364
#===============================
365365
# libav-tools (avconv): Is a fork of ffmpeg
366366
# (use in Ubuntu <= 14) packages: libav-tools libx264-142
367-
RUN apt-get update -qqy \
367+
RUN apt-get -qqy update \
368368
&& apt-get -qqy install \
369369
libx264-dev \
370370
libvorbis-dev \
@@ -377,7 +377,7 @@ RUN apt-get update -qqy \
377377
#=======================================================
378378
# gifify: check elgalu/gifify-docker instead
379379
# imagemagick convert between image formats as well as transformations
380-
# RUN apt-get update -qqy \
380+
# RUN apt-get -qqy update \
381381
# && apt-get -qqy install \
382382
# imagemagick \
383383
# fontconfig \
@@ -421,7 +421,7 @@ RUN apt-get update -qqy \
421421
#==========================
422422
# Mozilla Firefox - Latest
423423
#==========================
424-
# RUN apt-get update -qqy \
424+
# RUN apt-get -qqy update \
425425
# && apt-get -qqy install \
426426
# firefox \
427427
# && rm -rf /var/lib/apt/lists/*
@@ -431,7 +431,7 @@ RUN apt-get -qqy purge firefox
431431
#=========================================================
432432
# Python2 for Supervisor, selenium tests, and other stuff
433433
#=========================================================
434-
RUN apt-get update -qqy \
434+
RUN apt-get -qqy update \
435435
&& apt-get -qqy install \
436436
python2.7 \
437437
python-pip \
@@ -448,7 +448,7 @@ RUN apt-get update -qqy \
448448
#=========================================
449449
# Note Python3 fails installing mozInstall==1.12 with
450450
# NameError: name 'file' is not defined
451-
# RUN apt-get update -qqy \
451+
# RUN apt-get -qqy update \
452452
# && apt-get -qqy install \
453453
# python3.5 \
454454
# python3-pip \
@@ -504,7 +504,7 @@ ENV SEL_HOME ${NORMAL_USER_HOME}/selenium
504504
# Supervisor install
505505
#====================
506506
# https://github.com/Supervisor/supervisor
507-
# RUN apt-get update -qqy \
507+
# RUN apt-get -qqy update \
508508
# && apt-get -qqy install \
509509
# supervisor \
510510
# 2016-06-28 commit: 154cb4c84f28ac, version: supervisor-4.0.0.dev0
@@ -750,7 +750,7 @@ ENV CHROME_DRIVER_BASE "chromedriver.storage.googleapis.com"
750750
# Gets latest chrome driver version. Or you can hard-code it, e.g. 2.15
751751
RUN mkdir -p ${NORMAL_USER_HOME}/tmp && cd ${NORMAL_USER_HOME}/tmp \
752752
# 1st dup line CHROME_DRIVER_VERSION is just to invalidate docker cache
753-
&& CHROME_DRIVER_VERSION="2.23" \
753+
&& CHROME_DRIVER_VERSION="2.24" \
754754
# && CHROME_DRIVER_VERSION=$(curl 'https://chromedriver.storage.googleapis.com/LATEST_RELEASE' 2> /dev/null) \
755755
&& CHROME_DRIVER_URL="https://${CHROME_DRIVER_BASE}/${CHROME_DRIVER_VERSION}/${CHROME_DRIVER_FILE}" \
756756
&& wget -nv -O chromedriver_linux${CPU_ARCH}.zip ${CHROME_DRIVER_URL} \
@@ -797,7 +797,7 @@ USER root
797797
#=======
798798
# GDebi
799799
#=======
800-
RUN apt-get update -qqy \
800+
RUN apt-get -qqy update \
801801
&& apt-get -qqy install \
802802
gdebi
803803

@@ -837,7 +837,7 @@ RUN ln -s ${SEL_HOME}/chromedriver /usr/bin \
837837
# GNOME Shell provides core interface functions like switching windows,
838838
# launching applications or see your notifications
839839
#=========
840-
# RUN apt-get update -qqy \
840+
# RUN apt-get -qqy update \
841841
# && apt-get -qqy install \
842842
# gnome-shell \
843843
# && rm -rf /var/lib/apt/lists/*
@@ -847,7 +847,7 @@ RUN ln -s ${SEL_HOME}/chromedriver /usr/bin \
847847
# A Lightweight X11 Desktop Environment
848848
#=========
849849
# NOT working! TODO: see https://github.com/dockerfile/ubuntu-desktop/blob/master/Dockerfile#L13
850-
# RUN apt-get update -qqy \
850+
# RUN apt-get -qqy update \
851851
# && apt-get -qqy install \
852852
# lxde \
853853
# && mkdir -p /usr/share/backgrounds \
@@ -862,7 +862,7 @@ RUN ln -s ${SEL_HOME}/chromedriver /usr/bin \
862862
# The issue can be recreated with "ami-ed7c149a" and maybe in CentOS
863863
# ENV XAUTH_DIR /var/lib/lightdm
864864
# ENV XAUTHORITY ${XAUTH_DIR}/.Xauthority
865-
# RUN apt-get update -qqy \
865+
# RUN apt-get -qqy update \
866866
# && apt-get -qqy install \
867867
# lightdm dbus-x11 x11-common \
868868
# && dpkg-reconfigure --frontend noninteractive lightdm x11-common \
@@ -877,7 +877,7 @@ RUN ln -s ${SEL_HOME}/chromedriver /usr/bin \
877877
# GNOME ubuntu-desktop
878878
# The fat and full featured windows manager
879879
#======================
880-
# RUN apt-get update -qqy \
880+
# RUN apt-get -qqy update \
881881
# && apt-get -qqy install \
882882
# ubuntu-desktop \
883883
# && rm -rf /var/lib/apt/lists/*
@@ -893,7 +893,7 @@ ADD **/etc/supervisor/conf.d/* /etc/supervisor/conf.d/
893893
# to generate the /dev/random seed
894894
#==============================================
895895
# See: SeleniumHQ/docker-selenium/issues/14
896-
RUN apt-get update -qqy \
896+
RUN apt-get -qqy update \
897897
&& apt-key update -qqy \
898898
&& apt-get -qqy install \
899899
haveged rng-tools \

TBD_DOCKER_TAG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
+ Python: TBD_PYTHON_VERSION
1313
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
1414
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
15-
+ Tested on kernel dev host: 4.4.0-37-generic x86_64
15+
+ Tested on kernel dev host: 4.4.0-38-generic x86_64
1616
+ Tested on kernel CI host: TBD_HOST_UNAME
1717
+ Built at dev host with: Docker version 1.12.1, build 23cf638
1818
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

misc/misc.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,3 +439,8 @@ If you also want windows manager support, i.e. want to `make move` _(optional bu
439439
440440
make install_wmctrl
441441
442+
## Binaries
443+
444+
cd binaries && wget -O stable_updates.html "http://googlechromereleases.blogspot.de/search/label/Stable%20updates"
445+
VER=$(grep -Po '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' stable_updates.html | head -1)
446+
rm -f stable_updates.html && cd ..

0 commit comments

Comments
 (0)