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

Commit a8316cf

Browse files
committed
Upgrade Selenium minor from 3.0.1 to 3.1.0
1 parent 4da2067 commit a8316cf

File tree

8 files changed

+44
-12
lines changed

8 files changed

+44
-12
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.1"
40+
DOCKER_COMPOSE_VERSION="1.11.2"
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.1"
52+
DOCKER_COMPOSE_VERSION="1.11.2"
5353
# Linux with docker:stable compose:beta/older
5454
- os: linux
5555
language: c

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+
+ Date: TBD_DATE
12+
+ Upgrade Selenium minor from 3.0.1 to 3.1.0
13+
+ Image tag details:
14+
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
15+
+ Selenium 3: 3.1.0 (86a5d70)
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-64-generic x86_64
26+
+ Tested on kernel CI host: TBD_HOST_UNAME
27+
+ Built at dev host with: Docker version 1.13.1, build 092cba3
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.11.2, build dfed245
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-p9
1136
+ Date: 2017-02-07
1237
+ Add MP4Box (gpac) to clean the video credits to @taskworld @dtinth

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
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 "Add MP4Box (gpac) to clean the video credits to @taskworld @dtinth"
15+
git commit -m "Upgrade Selenium minor from 3.0.1 to 3.1.0"
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

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ RUN export SELBASE="https://selenium-release.storage.googleapis.com" \
236236
# Selenium 3
237237
#============
238238
# Layer size: medium: 22.14 MB
239-
ENV SEL_DIRECTORY="3.0" \
240-
SEL_VER="3.0.1"
239+
ENV SEL_DIRECTORY="3.1" \
240+
SEL_VER="3.1.0"
241241
RUN export SELBASE="https://selenium-release.storage.googleapis.com" \
242242
&& export SELPATH="${SEL_DIRECTORY}/selenium-server-standalone-${SEL_VER}.jar" \
243243
&& wget -nv ${SELBASE}/${SELPATH} \
@@ -328,6 +328,8 @@ RUN SHA="8be5bc15e83f0f261fa50ef28de814dd14f7c25e" \
328328
# fonts-ipafont-gothic 13.09 MB
329329
# xfonts-100dpi 5.939 MB
330330
# xfonts-75dpi 5.509 MB
331+
# Regarding fonts-liberation see:
332+
# https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
331333
# Layer size: small: 6.898 MB (with --no-install-recommends)
332334
# Layer size: small: 6.898 MB
333335
RUN apt-get -qqy update \
@@ -699,6 +701,10 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
699701
# WEBDRIVER_NODE_CHROME_PARAMS='-Dwebdriver.chrome.args="--no-sandbox"' \
700702
# Selenium capabilities descriptive (to avoid opera/ie warnings)
701703
# docs at https://code.google.com/p/selenium/wiki/Grid2
704+
# SEL_RELEASE_TIMEOUT_SECS
705+
# -timeout AKA GRID_TIMEOUT TODO fix with, ping @allanatadministrate
706+
# https://github.com/SeleniumHQ/docker-selenium/pull/393
707+
# SEL_BROWSER_TIMEOUT_SECS
702708
# SELENIUM_NODE_REGISTER_CYCLE
703709
# How often in ms the node will try to register itself again.
704710
# Allow to restart the hub without having to restart the nodes.

TBD_DOCKER_TAG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+ TBD_COMMIT_MSG
44
+ Image tag details:
55
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
6-
+ Selenium 3: 3.0.1 (1969d75)
6+
+ Selenium 3: 3.1.0 (86a5d70)
77
+ Chrome stable: TBD_CHROME_STABLE
88
+ Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
99
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
@@ -13,11 +13,11 @@
1313
+ Timezone: TBD_TIME_ZONE
1414
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
1515
+ Python: TBD_PYTHON_VERSION
16-
+ Tested on kernel dev host: 4.4.0-59-generic x86_64
16+
+ Tested on kernel dev host: 4.4.0-64-generic x86_64
1717
+ Tested on kernel CI host: TBD_HOST_UNAME
18-
+ Built at dev host with: Docker version 1.13.0, build 49bf474
18+
+ Built at dev host with: Docker version 1.13.1, build 092cba3
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.1, build b252738
20+
+ Built at dev host with: Docker Compose version 1.11.2, build dfed245
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-p9
1+
3.1.0-p0

docker-compose-host.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
version: '3'
1+
# This requires docker-compose >= 1.11.2
2+
version: '3.1'
23

34
services:
45
hub:

test/requirements-sele-3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
selenium>=3.0.1
1+
selenium>=3.0.2
22
retrying>=1.3.3

0 commit comments

Comments
 (0)